diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
index 4e1a8af9dc2..efbb92e3f19 100644
--- a/arch/arc/core/cache.c
+++ b/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>
 
diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
index cda7317c0ca..604d70898c9 100644
--- a/arch/arc/core/irq_manage.c
+++ b/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>
diff --git a/arch/arm/core/cortex_m/mpu/nxp_mpu.c b/arch/arm/core/cortex_m/mpu/nxp_mpu.c
index cb6bbf54c50..96bdb8b3f91 100644
--- a/arch/arm/core/cortex_m/mpu/nxp_mpu.c
+++ b/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
diff --git a/arch/arm/core/irq_manage.c b/arch/arm/core/irq_manage.c
index b03c646ad77..dfbea870127 100644
--- a/arch/arm/core/irq_manage.c
+++ b/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>
diff --git a/arch/arm/core/thread_abort.c b/arch/arm/core/thread_abort.c
index 613e174c610..657d4fc21ee 100644
--- a/arch/arm/core/thread_abort.c
+++ b/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);
 
diff --git a/arch/common/sw_isr_common.c b/arch/common/sw_isr_common.c
index f7fc9d20c5a..f312bfc96c7 100644
--- a/arch/common/sw_isr_common.c
+++ b/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)
  */
diff --git a/arch/nios2/core/cache.c b/arch/nios2/core/cache.c
index b5008b5534a..bdf1f499d68 100644
--- a/arch/nios2/core/cache.c
+++ b/arch/nios2/core/cache.c
@@ -5,7 +5,7 @@
  */
 
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 
 /**
diff --git a/arch/x86/core/ia32/irq_manage.c b/arch/x86/core/ia32/irq_manage.c
index 90fec202a58..b8965495aab 100644
--- a/arch/x86/core/ia32/irq_manage.c
+++ b/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>
diff --git a/arch/xtensa/core/irq_manage.c b/arch/xtensa/core/irq_manage.c
index a8b2612bc64..3c8c791a639 100644
--- a/arch/xtensa/core/irq_manage.c
+++ b/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
  *
diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c
index 880e0dc2173..43d6abcfb6b 100644
--- a/drivers/adc/adc_sam_afec.c
+++ b/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>
diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c
index 696d562e55f..c112c5ef7c9 100644
--- a/drivers/clock_control/nrf_power_clock.c
+++ b/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>
diff --git a/drivers/clock_control/quark_se_clock_control.c b/drivers/clock_control/quark_se_clock_control.c
index 9106075974e..871e8805dc7 100644
--- a/drivers/clock_control/quark_se_clock_control.c
+++ b/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>
diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c
index 8ebee5096d6..aea4a81f3b3 100644
--- a/drivers/console/ipm_console_receiver.c
+++ b/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)
 {
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index a02c4a1f734..e9521235132 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/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>
diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
index 410e26f5722..c13859dcb33 100644
--- a/drivers/entropy/entropy_stm32.c
+++ b/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>
diff --git a/drivers/ethernet/eth_dw.c b/drivers/ethernet/eth_dw.c
index d58f7d01cf6..761b1934ff8 100644
--- a/drivers/ethernet/eth_dw.c
+++ b/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>
diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
index a91e2f0141f..8daac1d3ae7 100644
--- a/drivers/ethernet/eth_sam_gmac.c
+++ b/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>
diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c
index 7ea1082e599..2c968616529 100644
--- a/drivers/ethernet/eth_smsc911x.c
+++ b/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>
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index cb496540c40..f7dc1448eec 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/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>
diff --git a/drivers/flash/flash_stm32wbx.c b/drivers/flash/flash_stm32wbx.c
index a44d977857c..ba5bbb111dd 100644
--- a/drivers/flash/flash_stm32wbx.c
+++ b/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"
 
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index 03668061bd7..620bd2422d7 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/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"
diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c
index d1df171ac0e..39dff13465e 100644
--- a/drivers/gpio/gpio_cc13xx_cc26xx.c
+++ b/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>
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 57bfe858915..bb5e55cce75 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/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
diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c
index 196e6eea070..8b2e5881616 100644
--- a/drivers/gpio/gpio_intel_apl.c
+++ b/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>
 
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index aee23b015ea..89ba2ea827c 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/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>
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index 96c5ad4e3d8..c3c37ebc006 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/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>
diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c
index 6a6055e59fc..4ebbfb1bbed 100644
--- a/drivers/i2s/i2s_cavs.c
+++ b/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>
diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c
index 55390ec37c2..2d3d06c61ea 100644
--- a/drivers/i2s/i2s_sam_ssc.c
+++ b/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>
diff --git a/drivers/interrupt_controller/exti_stm32.c b/drivers/interrupt_controller/exti_stm32.c
index c58ba29ce32..85f358280f7 100644
--- a/drivers/interrupt_controller/exti_stm32.c
+++ b/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) || \
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c
index d1e00fd6e1b..924ff1d558f 100644
--- a/drivers/interrupt_controller/loapic_intr.c
+++ b/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>
diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/system_apic.c
index 1bf65847a6e..c854fabe709 100644
--- a/drivers/interrupt_controller/system_apic.c
+++ b/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>
diff --git a/drivers/ipm/ipm_quark_se.c b/drivers/ipm/ipm_quark_se.c
index 74bf0067aeb..59bd9c3ecdb 100644
--- a/drivers/ipm/ipm_quark_se.c
+++ b/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"
 
diff --git a/drivers/pinmux/pinmux_cc13xx_cc26xx.c b/drivers/pinmux/pinmux_cc13xx_cc26xx.c
index 0d38e99c440..6098c849507 100644
--- a/drivers/pinmux/pinmux_cc13xx_cc26xx.c
+++ b/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>
diff --git a/drivers/pinmux/pinmux_cc2650.c b/drivers/pinmux/pinmux_cc2650.c
index 65807200513..19c87e7e731 100644
--- a/drivers/pinmux/pinmux_cc2650.c
+++ b/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>
diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c
index d07785cef9a..8f044673fce 100644
--- a/drivers/sensor/adt7420/adt7420.c
+++ b/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"
 
diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c
index 03ac0b5051c..11a299359da 100644
--- a/drivers/sensor/adxl362/adxl362.c
+++ b/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>
 
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index eb2be036ba3..1dc502bdc1a 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/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>
diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c
index fd1f5eaa3a0..e4bb34416d4 100644
--- a/drivers/sensor/ak8975/ak8975.c
+++ b/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>
diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c
index 79aba35140e..ab393d79c1e 100644
--- a/drivers/sensor/amg88xx/amg88xx.c
+++ b/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"
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c
index 13568aca681..5a523949843 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.c
+++ b/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"
diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c
index b483e884299..040c985b00b 100644
--- a/drivers/sensor/apds9960/apds9960.c
+++ b/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>
diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c
index 8f77e35136d..71e38a12d4a 100644
--- a/drivers/sensor/bma280/bma280.c
+++ b/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"
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c
index a107d73c53f..00202bb771f 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.c
+++ b/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>
diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c
index f626d9baa2c..c60db045389 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/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>
diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c
index 9ea61e66b34..03bf94005a0 100644
--- a/drivers/sensor/bme680/bme680.c
+++ b/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>
diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c
index 6d2788a1bf1..c4822a96485 100644
--- a/drivers/sensor/bmi160/bmi160.c
+++ b/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"
diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h
index 22e44c43602..dd532321902 100644
--- a/drivers/sensor/bmm150/bmm150.h
+++ b/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
diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c
index f1fd4d51b98..3bb49765e81 100644
--- a/drivers/sensor/ccs811/ccs811.c
+++ b/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"
diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c
index 1e41bbe8ab6..a4a76b119f3 100644
--- a/drivers/sensor/ens210/ens210.c
+++ b/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"
 
diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c
index 82d5722b8a6..66eac1b487b 100644
--- a/drivers/sensor/fxas21002/fxas21002.c
+++ b/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
diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c
index c495be6757d..21429f36b9a 100644
--- a/drivers/sensor/fxos8700/fxos8700.c
+++ b/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>
 
diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c
index beb2ac431a3..22e2d23b6b4 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.c
+++ b/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>
diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
index 2e35b3abafb..381984c8245 100644
--- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c
+++ b/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>
diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c
index 15baf9e9f9b..c9a62e723eb 100644
--- a/drivers/sensor/hts221/hts221.c
+++ b/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>
diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c
index 89a47bcb195..9ecb0a92ec5 100644
--- a/drivers/sensor/hts221/hts221_trigger.c
+++ b/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>
diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c
index d5bce22cfbc..761b40781c8 100644
--- a/drivers/sensor/isl29035/isl29035.c
+++ b/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"
diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c
index 6a0f7cf0a2c..c8dd03ea787 100644
--- a/drivers/sensor/lis2dh/lis2dh.c
+++ b/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
diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c
index 862e95b8b3f..74c1f724791 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.c
+++ b/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"
diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
index 4c19e42a1c6..5bc208234e0 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c
+++ b/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>
diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c
index f18c398a81a..c29bf343115 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.c
+++ b/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>
diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c
index 0ef34ed11e7..1985c442dbf 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.c
+++ b/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>
diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c
index 88a2d94ee90..cb909d4f712 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.c
+++ b/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>
diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
index 655eefd786d..5f8fd96dfb6 100644
--- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c
+++ b/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>
diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c
index 75140db686d..8a87eda1235 100644
--- a/drivers/sensor/lps22hb/lps22hb.c
+++ b/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"
diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c
index de10638ebc1..0e4c45dbaba 100644
--- a/drivers/sensor/lps25hb/lps25hb.c
+++ b/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"
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c
index 34ad434665f..efe21a6c833 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.c
+++ b/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"
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c
index c3d8aeeb4b8..1b8f4956a0c 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.c
+++ b/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"
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
index 86bc13ad52f..fe6c2ad4823 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
+++ b/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>
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
index 7fca299752a..62a0c6dfeef 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
+++ b/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>
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
index 8119f310817..3394f46027d 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
+++ b/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>
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
index 1ed5da1f07d..6dee38b5765 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
+++ b/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>
 
diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c
index ead2b73d172..4fe5fe3a646 100644
--- a/drivers/sensor/max44009/max44009.c
+++ b/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"
diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c
index f6821b333ba..847751269b4 100644
--- a/drivers/sensor/mcp9808/mcp9808.c
+++ b/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"
diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c
index b25316941b6..6bb12f32d50 100644
--- a/drivers/sensor/mcp9808/mcp9808_trigger.c
+++ b/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"
 
diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c
index ce517ef179b..63a26bd3617 100644
--- a/drivers/sensor/ms5837/ms5837.c
+++ b/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"
 
diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c
index 09397b96bbd..3cfe42d6949 100644
--- a/drivers/sensor/sht3xd/sht3xd.c
+++ b/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"
diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c
index adc1e6af787..71f9ddff7f2 100644
--- a/drivers/sensor/sx9500/sx9500.c
+++ b/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"
diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c
index 4d869334f97..7b15891a980 100644
--- a/drivers/sensor/th02/th02.c
+++ b/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"
diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c
index de0b5ee51e3..a799124415b 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.c
+++ b/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"
diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c
index 0e69dec3750..8db1ecf3bc3 100644
--- a/drivers/sensor/tmp007/tmp007.c
+++ b/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"
diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c
index 3b8e1e02576..02eb101b8a2 100644
--- a/drivers/sensor/tmp112/tmp112.c
+++ b/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
diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c
index 4d1c1d7c482..b57f9f85c07 100644
--- a/drivers/sensor/vl53l0x/vl53l0x.c
+++ b/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>
diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c
index d847a452ab1..2bdcb677113 100644
--- a/drivers/serial/uart_cc13xx_cc26xx.c
+++ b/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>
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index c279efb7ec8..944ff3e9440 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/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>
diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c
index 577ba2a23d8..ac4ebababcb 100644
--- a/drivers/serial/uart_imx.c
+++ b/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>
diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c
index 593cafa6fca..434b8a586ff 100644
--- a/drivers/serial/uart_nsim.c
+++ b/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>
diff --git a/drivers/serial/uart_psoc6.c b/drivers/serial/uart_psoc6.c
index 05ba75a8232..3c46d9f1fbf 100644
--- a/drivers/serial/uart_psoc6.c
+++ b/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>
 
diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c
index 2f983ba336f..8a8f1430986 100644
--- a/drivers/serial/uart_sam.c
+++ b/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>
diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c
index 4653c5eea24..2e15e8642c4 100644
--- a/drivers/serial/uart_sam0.c
+++ b/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>
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 1cecdd37a43..d4d4a2371f8 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/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>
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 41e5f779556..73cb5f6c429 100644
--- a/drivers/serial/uart_stm32.c
+++ b/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>
diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c
index 6f0a85f0df8..cd645e0a3b5 100644
--- a/drivers/serial/usart_sam.c
+++ b/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>
diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c
index d90eddd22e8..25c35dbfcfd 100644
--- a/drivers/spi/spi_intel.c
+++ b/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>
 
diff --git a/ext/hal/ti/simplelink/kernel/zephyr/dpl/ClockP_zephyr.c b/ext/hal/ti/simplelink/kernel/zephyr/dpl/ClockP_zephyr.c
index ccdc121bf63..aa8f2caf274 100644
--- a/ext/hal/ti/simplelink/kernel/zephyr/dpl/ClockP_zephyr.c
+++ b/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>
 
diff --git a/ext/hal/ti/simplelink/kernel/zephyr/dpl/HwiP_zephyr.c b/ext/hal/ti/simplelink/kernel/zephyr/dpl/HwiP_zephyr.c
index fe28f6f1724..8201fcda357 100644
--- a/ext/hal/ti/simplelink/kernel/zephyr/dpl/HwiP_zephyr.c
+++ b/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>
 
diff --git a/ext/hal/ti/simplelink/kernel/zephyr/dpl/MutexP_zephyr.c b/ext/hal/ti/simplelink/kernel/zephyr/dpl/MutexP_zephyr.c
index 0b5a8be7e21..ead1f5e4373 100644
--- a/ext/hal/ti/simplelink/kernel/zephyr/dpl/MutexP_zephyr.c
+++ b/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>
 
diff --git a/ext/hal/ti/simplelink/kernel/zephyr/dpl/SemaphoreP_zephyr.c b/ext/hal/ti/simplelink/kernel/zephyr/dpl/SemaphoreP_zephyr.c
index 7d9816b45ad..07fb5b36859 100644
--- a/ext/hal/ti/simplelink/kernel/zephyr/dpl/SemaphoreP_zephyr.c
+++ b/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>
 
diff --git a/ext/hal/ti/simplelink/kernel/zephyr/dpl/dpl.c b/ext/hal/ti/simplelink/kernel/zephyr/dpl/dpl.c
index b8d210de092..33c549fdb82 100644
--- a/ext/hal/ti/simplelink/kernel/zephyr/dpl/dpl.c
+++ b/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>
diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
index 6232c728e18..f45e2ca200a 100644
--- a/include/crypto/cipher.h
+++ b/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 */
diff --git a/include/drivers/clock_control.h b/include/drivers/clock_control.h
index 8afa589113f..e95e4292f13 100644
--- a/include/drivers/clock_control.h
+++ b/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
diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h
index bd732533e70..1f8e87d9f75 100644
--- a/include/drivers/gpio.h
+++ b/include/drivers/gpio.h
@@ -13,7 +13,7 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_GPIO_H_
 #define ZEPHYR_INCLUDE_DRIVERS_GPIO_H_
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/slist.h>
 
 #include <zephyr/types.h>
diff --git a/include/kernel_includes.h b/include/kernel_includes.h
index 0d4c4fcc6e9..5d62acee21e 100644
--- a/include/kernel_includes.h
+++ b/include/kernel_includes.h
@@ -19,7 +19,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <sys/atomic.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <sched_priq.h>
 #include <misc/dlist.h>
 #include <misc/slist.h>
diff --git a/include/misc/__assert.h b/include/misc/__assert.h
index 2b7618277ab..8e3e90849e9 100644
--- a/include/misc/__assert.h
+++ b/include/misc/__assert.h
@@ -1,129 +1,15 @@
 /*
- * Copyright (c) 2011-2014 Wind River Systems, Inc.
+ * Copyright (c) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-/**
- * @file
- * @brief Debug aid
- *
- *
- * The __ASSERT() macro can be used inside kernel code.
- *
- * Assertions are enabled by setting the __ASSERT_ON symbol to a non-zero value.
- * There are two ways to do this:
- *   a) Use the ASSERT and ASSERT_LEVEL kconfig options
- *   b) Add "CFLAGS += -D__ASSERT_ON=<level>" at the end of a project's Makefile
- * The Makefile method takes precedence over the kconfig option if both are
- * used.
- *
- * Specifying an assertion level of 1 causes the compiler to issue warnings that
- * the kernel contains debug-type __ASSERT() statements; this reminder is issued
- * since assertion code is not normally present in a final product. Specifying
- * assertion level 2 suppresses these warnings.
- *
- * The __ASSERT_EVAL() macro can also be used inside kernel code.
- *
- * It makes use of the __ASSERT() macro, but has some extra flexibility.  It
- * allows the developer to specify different actions depending whether the
- * __ASSERT() macro is enabled or not.  This can be particularly useful to
- * prevent the compiler from generating comments (errors, warnings or remarks)
- * about variables that are only used with __ASSERT() being assigned a value,
- * but otherwise unused when the __ASSERT() macro is disabled.
- *
- * Consider the following example:
- *
- * int  x;
- *
- * x = foo ();
- * __ASSERT (x != 0, "foo() returned zero!");
- *
- * If __ASSERT() is disabled, then 'x' is assigned a value, but never used.
- * This type of situation can be resolved using the __ASSERT_EVAL() macro.
- *
- * __ASSERT_EVAL ((void) foo(),
- *		  int x = foo(),
- *                x != 0,
- *                "foo() returned zero!");
- *
- * The first parameter tells __ASSERT_EVAL() what to do if __ASSERT() is
- * disabled.  The second parameter tells __ASSERT_EVAL() what to do if
- * __ASSERT() is enabled.  The third and fourth parameters are the parameters
- * it passes to __ASSERT().
- *
- * The __ASSERT_NO_MSG() macro can be used to perform an assertion that reports
- * the failed test and its location, but lacks additional debugging information
- * provided to assist the user in diagnosing the problem; its use is
- * discouraged.
- */
-
 #ifndef ZEPHYR_INCLUDE_MISC___ASSERT_H_
 #define ZEPHYR_INCLUDE_MISC___ASSERT_H_
 
-#include <stdbool.h>
-
-#ifdef CONFIG_ASSERT
-#ifndef __ASSERT_ON
-#define __ASSERT_ON CONFIG_ASSERT_LEVEL
-#endif
+#ifndef CONFIG_COMPAT_INCLUDES
+#warning "This header file has moved, include <sys/__assert.h> instead."
 #endif
 
-#ifdef CONFIG_FORCE_NO_ASSERT
-#undef __ASSERT_ON
-#define __ASSERT_ON 0
-#endif
-
-#ifdef __ASSERT_ON
-#if (__ASSERT_ON < 0) || (__ASSERT_ON > 2)
-#error "Invalid __ASSERT() level: must be between 0 and 2"
-#endif
-
-#if __ASSERT_ON
-#include <misc/printk.h>
-void assert_post_action(const char *file, unsigned int line);
-
-#define __ASSERT_LOC(test)                               \
-	printk("ASSERTION FAIL [%s] @ %s:%d\n",    \
-	       Z_STRINGIFY(test),                         \
-	       __FILE__,                                 \
-	       __LINE__)                                 \
-
-#define __ASSERT_NO_MSG(test)                                            \
-	do {                                                             \
-		if (!(test)) {                                           \
-			__ASSERT_LOC(test);                              \
-			assert_post_action(__FILE__, __LINE__);          \
-		}                                                        \
-	} while (false)
-
-#define __ASSERT(test, fmt, ...)                                         \
-	do {                                                             \
-		if (!(test)) {                                           \
-			__ASSERT_LOC(test);                              \
-			printk("\t" fmt "\n", ##__VA_ARGS__);            \
-			assert_post_action(__FILE__, __LINE__);          \
-		}                                                        \
-	} while (false)
-
-#define __ASSERT_EVAL(expr1, expr2, test, fmt, ...)                \
-	do {                                                       \
-		expr2;                                             \
-		__ASSERT(test, fmt, ##__VA_ARGS__);                \
-	} while (false)
-
-#if (__ASSERT_ON == 1)
-#warning "__ASSERT() statements are ENABLED"
-#endif
-#else
-#define __ASSERT(test, fmt, ...) { }
-#define __ASSERT_EVAL(expr1, expr2, test, fmt, ...) expr1
-#define __ASSERT_NO_MSG(test) { }
-#endif
-#else
-#define __ASSERT(test, fmt, ...) { }
-#define __ASSERT_EVAL(expr1, expr2, test, fmt, ...) expr1
-#define __ASSERT_NO_MSG(test) { }
-#endif
+#include <sys/__assert.h>
 
 #endif /* ZEPHYR_INCLUDE_MISC___ASSERT_H_ */
diff --git a/include/misc/byteorder.h b/include/misc/byteorder.h
index 1a94d4d214a..6ed502f4b22 100644
--- a/include/misc/byteorder.h
+++ b/include/misc/byteorder.h
@@ -13,7 +13,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 /* Internal helpers only used by the sys_* APIs further below */
 #define __bswap_16(x) ((u16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
diff --git a/include/net/net_core.h b/include/net/net_core.h
index 4a4ce6cae96..f008e865087 100644
--- a/include/net/net_core.h
+++ b/include/net/net_core.h
@@ -44,7 +44,7 @@ extern "C" {
 #define NET_WARN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__)
 #define NET_INFO(fmt, ...) LOG_INF(fmt,  ##__VA_ARGS__)
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #define NET_ASSERT(cond) __ASSERT_NO_MSG(cond)
 #define NET_ASSERT_INFO(cond, fmt, ...) __ASSERT(cond, fmt, ##__VA_ARGS__)
diff --git a/include/net/net_mgmt.h b/include/net/net_mgmt.h
index 0380cdd3ba8..b1c2f7233a3 100644
--- a/include/net/net_mgmt.h
+++ b/include/net/net_mgmt.h
@@ -23,7 +23,7 @@ extern "C" {
  * @{
  */
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <net/net_core.h>
 
 struct net_if;
diff --git a/include/spinlock.h b/include/spinlock.h
index 74e67ebb3a1..831fb7a69f1 100644
--- a/include/spinlock.h
+++ b/include/spinlock.h
@@ -34,7 +34,7 @@ static inline void z_arch_irq_unlock(int key)
  */
 #if (CONFIG_FLASH_SIZE == 0) || (CONFIG_FLASH_SIZE > 32)
 #if defined(CONFIG_ASSERT) && (CONFIG_MP_NUM_CPUS < 4)
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <stdbool.h>
 struct k_spinlock;
 bool z_spin_lock_valid(struct k_spinlock *l);
diff --git a/include/sys/__assert.h b/include/sys/__assert.h
new file mode 100644
index 00000000000..0a4810612e1
--- /dev/null
+++ b/include/sys/__assert.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2011-2014 Wind River Systems, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Debug aid
+ *
+ *
+ * The __ASSERT() macro can be used inside kernel code.
+ *
+ * Assertions are enabled by setting the __ASSERT_ON symbol to a non-zero value.
+ * There are two ways to do this:
+ *   a) Use the ASSERT and ASSERT_LEVEL kconfig options
+ *   b) Add "CFLAGS += -D__ASSERT_ON=<level>" at the end of a project's Makefile
+ * The Makefile method takes precedence over the kconfig option if both are
+ * used.
+ *
+ * Specifying an assertion level of 1 causes the compiler to issue warnings that
+ * the kernel contains debug-type __ASSERT() statements; this reminder is issued
+ * since assertion code is not normally present in a final product. Specifying
+ * assertion level 2 suppresses these warnings.
+ *
+ * The __ASSERT_EVAL() macro can also be used inside kernel code.
+ *
+ * It makes use of the __ASSERT() macro, but has some extra flexibility.  It
+ * allows the developer to specify different actions depending whether the
+ * __ASSERT() macro is enabled or not.  This can be particularly useful to
+ * prevent the compiler from generating comments (errors, warnings or remarks)
+ * about variables that are only used with __ASSERT() being assigned a value,
+ * but otherwise unused when the __ASSERT() macro is disabled.
+ *
+ * Consider the following example:
+ *
+ * int  x;
+ *
+ * x = foo ();
+ * __ASSERT (x != 0, "foo() returned zero!");
+ *
+ * If __ASSERT() is disabled, then 'x' is assigned a value, but never used.
+ * This type of situation can be resolved using the __ASSERT_EVAL() macro.
+ *
+ * __ASSERT_EVAL ((void) foo(),
+ *		  int x = foo(),
+ *                x != 0,
+ *                "foo() returned zero!");
+ *
+ * The first parameter tells __ASSERT_EVAL() what to do if __ASSERT() is
+ * disabled.  The second parameter tells __ASSERT_EVAL() what to do if
+ * __ASSERT() is enabled.  The third and fourth parameters are the parameters
+ * it passes to __ASSERT().
+ *
+ * The __ASSERT_NO_MSG() macro can be used to perform an assertion that reports
+ * the failed test and its location, but lacks additional debugging information
+ * provided to assist the user in diagnosing the problem; its use is
+ * discouraged.
+ */
+
+#ifndef ZEPHYR_INCLUDE_SYS___ASSERT_H_
+#define ZEPHYR_INCLUDE_SYS___ASSERT_H_
+
+#include <stdbool.h>
+
+#ifdef CONFIG_ASSERT
+#ifndef __ASSERT_ON
+#define __ASSERT_ON CONFIG_ASSERT_LEVEL
+#endif
+#endif
+
+#ifdef CONFIG_FORCE_NO_ASSERT
+#undef __ASSERT_ON
+#define __ASSERT_ON 0
+#endif
+
+#ifdef __ASSERT_ON
+#if (__ASSERT_ON < 0) || (__ASSERT_ON > 2)
+#error "Invalid __ASSERT() level: must be between 0 and 2"
+#endif
+
+#if __ASSERT_ON
+#include <misc/printk.h>
+void assert_post_action(const char *file, unsigned int line);
+
+#define __ASSERT_LOC(test)                               \
+	printk("ASSERTION FAIL [%s] @ %s:%d\n",    \
+	       Z_STRINGIFY(test),                         \
+	       __FILE__,                                 \
+	       __LINE__)                                 \
+
+#define __ASSERT_NO_MSG(test)                                            \
+	do {                                                             \
+		if (!(test)) {                                           \
+			__ASSERT_LOC(test);                              \
+			assert_post_action(__FILE__, __LINE__);          \
+		}                                                        \
+	} while (false)
+
+#define __ASSERT(test, fmt, ...)                                         \
+	do {                                                             \
+		if (!(test)) {                                           \
+			__ASSERT_LOC(test);                              \
+			printk("\t" fmt "\n", ##__VA_ARGS__);            \
+			assert_post_action(__FILE__, __LINE__);          \
+		}                                                        \
+	} while (false)
+
+#define __ASSERT_EVAL(expr1, expr2, test, fmt, ...)                \
+	do {                                                       \
+		expr2;                                             \
+		__ASSERT(test, fmt, ##__VA_ARGS__);                \
+	} while (false)
+
+#if (__ASSERT_ON == 1)
+#warning "__ASSERT() statements are ENABLED"
+#endif
+#else
+#define __ASSERT(test, fmt, ...) { }
+#define __ASSERT_EVAL(expr1, expr2, test, fmt, ...) expr1
+#define __ASSERT_NO_MSG(test) { }
+#endif
+#else
+#define __ASSERT(test, fmt, ...) { }
+#define __ASSERT_EVAL(expr1, expr2, test, fmt, ...) expr1
+#define __ASSERT_NO_MSG(test) { }
+#endif
+
+#endif /* ZEPHYR_INCLUDE_SYS___ASSERT_H_ */
diff --git a/kernel/mem_domain.c b/kernel/mem_domain.c
index eca6bf56414..841d008826f 100644
--- a/kernel/mem_domain.c
+++ b/kernel/mem_domain.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <kernel_structs.h>
 #include <kernel_internal.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <stdbool.h>
 #include <spinlock.h>
 
diff --git a/kernel/mempool.c b/kernel/mempool.c
index 83ac347a456..ad2849f1749 100644
--- a/kernel/mempool.c
+++ b/kernel/mempool.c
@@ -9,7 +9,7 @@
 #include <wait_q.h>
 #include <init.h>
 #include <string.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/math_extras.h>
 #include <stdbool.h>
 
diff --git a/kernel/pipes.c b/kernel/pipes.c
index 80f5146fe48..96671496abb 100644
--- a/kernel/pipes.c
+++ b/kernel/pipes.c
@@ -19,7 +19,7 @@
 #include <misc/dlist.h>
 #include <init.h>
 #include <syscall_handler.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel_internal.h>
 
 struct k_pipe_desc {
diff --git a/kernel/poll.c b/kernel/poll.c
index 2c7cb8afa70..bd5e4876c29 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -23,7 +23,7 @@
 #include <misc/slist.h>
 #include <misc/dlist.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <stdbool.h>
 
 /* Single subsystem lock.  Locking per-event would be better on highly
diff --git a/kernel/stack.c b/kernel/stack.c
index b0c7d6fae39..6f730356699 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c
@@ -15,7 +15,7 @@
 #include <linker/sections.h>
 #include <ksched.h>
 #include <wait_q.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <init.h>
 #include <syscall_handler.h>
 #include <kernel_internal.h>
diff --git a/kernel/thread_abort.c b/kernel/thread_abort.c
index 61bca7ff28d..ef474b74315 100644
--- a/kernel/thread_abort.c
+++ b/kernel/thread_abort.c
@@ -19,7 +19,7 @@
 #include <linker/sections.h>
 #include <wait_q.h>
 #include <ksched.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <syscall_handler.h>
 
 extern void z_thread_single_abort(struct k_thread *thread);
diff --git a/lib/libc/minimal/include/assert.h b/lib/libc/minimal/include/assert.h
index 8f9a52c5184..aabec612a4d 100644
--- a/lib/libc/minimal/include/assert.h
+++ b/lib/libc/minimal/include/assert.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_
 #define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/os/assert.c b/lib/os/assert.c
index a9956f599a4..d55e6f098cf 100644
--- a/lib/os/assert.c
+++ b/lib/os/assert.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <zephyr.h>
 
 
diff --git a/lib/os/mempool.c b/lib/os/mempool.c
index 5b035afb010..5d0ed004be9 100644
--- a/lib/os/mempool.c
+++ b/lib/os/mempool.c
@@ -6,7 +6,7 @@
 
 #include <kernel.h>
 #include <string.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/mempool_base.h>
 #include <misc/mempool.h>
 
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index 19a795b6c5f..b0d2c2b86e1 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/gpio.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <string.h>
 
 /* size of stack area used by each thread */
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index 5612e96ab3b..c57586bb990 100644
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@@ -43,7 +43,7 @@
 #include <misc/printk.h>
 #endif
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #define SEMAPHORES 1
 #define MUTEXES 2
diff --git a/samples/portability/cmsis_rtos_v1/philosophers/src/main.c b/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
index 3dcadcedaba..83497439ba7 100644
--- a/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
+++ b/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
@@ -37,7 +37,7 @@
 #include <misc/printk.h>
 #endif
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include "phil_obj_abstract.h"
 
diff --git a/samples/portability/cmsis_rtos_v2/philosophers/src/main.c b/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
index 393f1b5504d..a0bdbdc0c1d 100644
--- a/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
+++ b/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
@@ -33,7 +33,7 @@
 #include <cmsis_os2.h>
 #include <misc/printk.h>
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include "phil_obj_abstract.h"
 
diff --git a/samples/sensor/adt7420/src/main.c b/samples/sensor/adt7420/src/main.c
index 2705a424d34..10194ccc57b 100644
--- a/samples/sensor/adt7420/src/main.c
+++ b/samples/sensor/adt7420/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <stdio.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 K_SEM_DEFINE(sem, 0, 1);
 
diff --git a/samples/sensor/ti_hdc/src/main.c b/samples/sensor/ti_hdc/src/main.c
index b39fd2b5d93..5ebd7f8aa10 100644
--- a/samples/sensor/ti_hdc/src/main.c
+++ b/samples/sensor/ti_hdc/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 #include <drivers/gpio.h>
 
diff --git a/samples/sensor/tmp112/src/main.c b/samples/sensor/tmp112/src/main.c
index 09b7b158829..1fbd936dc7e 100644
--- a/samples/sensor/tmp112/src/main.c
+++ b/samples/sensor/tmp112/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 static void do_main(struct device *dev)
 {
diff --git a/soc/arc/quark_se_c1000_ss/power.c b/soc/arc/quark_se_c1000_ss/power.c
index 9746dc10d33..4b8109a597d 100644
--- a/soc/arc/quark_se_c1000_ss/power.c
+++ b/soc/arc/quark_se_c1000_ss/power.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <sys/sys_io.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <power/power.h>
 #include <soc_power.h>
 #include <init.h>
diff --git a/soc/arm/atmel_sam/common/soc_gpio.c b/soc/arm/atmel_sam/common/soc_gpio.c
index 23911479b39..ac066e6da64 100644
--- a/soc/arm/atmel_sam/common/soc_gpio.c
+++ b/soc/arm/atmel_sam/common/soc_gpio.c
@@ -8,7 +8,7 @@
  * module HAL driver.
  */
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include "soc_gpio.h"
 
 /*
diff --git a/soc/arm/atmel_sam/common/soc_pmc.c b/soc/arm/atmel_sam/common/soc_pmc.c
index 9808f93e252..5506732a5f4 100644
--- a/soc/arm/atmel_sam/common/soc_pmc.c
+++ b/soc/arm/atmel_sam/common/soc_pmc.c
@@ -9,7 +9,7 @@
  */
 
 #include <soc.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 
 #if ID_PERIPH_COUNT > 74
diff --git a/soc/x86/intel_quark/quark_se/power.c b/soc/x86/intel_quark/quark_se/power.c
index 500f9f059af..b145e30d00e 100644
--- a/soc/x86/intel_quark/quark_se/power.c
+++ b/soc/x86/intel_quark/quark_se/power.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <sys/sys_io.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <power/power.h>
 #include <soc_power.h>
 #include <soc.h>
diff --git a/soc/x86/intel_quark/quark_se/soc.c b/soc/x86/intel_quark/quark_se/soc.c
index a5d9b0eab1e..f8186ce441e 100644
--- a/soc/x86/intel_quark/quark_se/soc.c
+++ b/soc/x86/intel_quark/quark_se/soc.c
@@ -16,7 +16,7 @@
 
 #include <kernel.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include "soc.h"
 #include <drivers/uart.h>
 #include <init.h>
diff --git a/soc/x86/intel_quark/quark_x1000/soc.c b/soc/x86/intel_quark/quark_x1000/soc.c
index 76fa7d68f91..34e451551f2 100644
--- a/soc/x86/intel_quark/quark_x1000/soc.c
+++ b/soc/x86/intel_quark/quark_x1000/soc.c
@@ -19,7 +19,7 @@
 #include <init.h>
 #include <device.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include "soc.h"
 #include <drivers/uart.h>
 #include <drivers/pci/pci.h>
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 95c545d08a2..c42c99eb2ad 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -15,7 +15,7 @@
 #include <misc/util.h>
 #include <misc/slist.h>
 #include <misc/stack.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <bluetooth/hci.h>
 #include <bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 32e56ca66e2..9c5a72fa69a 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -16,7 +16,7 @@
 #include <misc/slist.h>
 #include <misc/byteorder.h>
 #include <misc/stack.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 
 #include <settings/settings.h>
diff --git a/subsys/bluetooth/host/sdp.c b/subsys/bluetooth/host/sdp.c
index 82d5b2cee7d..6fc43702b9e 100644
--- a/subsys/bluetooth/host/sdp.c
+++ b/subsys/bluetooth/host/sdp.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <bluetooth/sdp.h>
 
diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 93bcafae2e9..e0005c4d194 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -14,7 +14,7 @@
 #include <zephyr.h>
 #include <init.h>
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <dfu/mcuboot.h>
 
diff --git a/subsys/disk/disk_access.c b/subsys/disk/disk_access.c
index 2486e4c4ddb..2d4e7caa82c 100644
--- a/subsys/disk/disk_access.c
+++ b/subsys/disk/disk_access.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <init.h>
 #include <disk/disk_access.h>
diff --git a/subsys/disk/disk_access_flash.c b/subsys/disk/disk_access_flash.c
index 563197a3571..2b1de492a1c 100644
--- a/subsys/disk/disk_access_flash.c
+++ b/subsys/disk/disk_access_flash.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <disk/disk_access.h>
 #include <errno.h>
diff --git a/subsys/disk/disk_access_ram.c b/subsys/disk/disk_access_ram.c
index 7820667b1ae..5943ea362a2 100644
--- a/subsys/disk/disk_access_ram.c
+++ b/subsys/disk/disk_access_ram.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <disk/disk_access.h>
 #include <errno.h>
 #include <init.h>
diff --git a/subsys/fs/fat_fs.c b/subsys/fs/fat_fs.c
index d75b9f3d3d4..e2c26aeff9b 100644
--- a/subsys/fs/fat_fs.c
+++ b/subsys/fs/fat_fs.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <init.h>
 #include <fs/fs.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <ff.h>
 
 #define FATFS_MAX_FILE_NAME 12 /* Uses 8.3 SFN */
diff --git a/subsys/fs/nffs_fs.c b/subsys/fs/nffs_fs.c
index 83738cae0a7..0a5c3801c6f 100644
--- a/subsys/fs/nffs_fs.c
+++ b/subsys/fs/nffs_fs.c
@@ -12,7 +12,7 @@
 #include <drivers/flash.h>
 #include <fs/fs.h>
 #include <sys/crc.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/printk.h>
 #include <nffs/os.h>
 #include <nffs/nffs.h>
diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index f23c5be9252..fc83ff381ba 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 
 #include <init.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <openthread/cli.h>
 #include <openthread/ip6.h>
diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c
index e4ca4187b32..8bef7f01c01 100644
--- a/subsys/net/lib/openthread/platform/radio.c
+++ b/subsys/net/lib/openthread/platform/radio.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <device.h>
 #include <net/ieee802154_radio.h>
 #include <net/net_pkt.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <openthread-system.h>
 #include <openthread/instance.h>
diff --git a/subsys/power/device_pm.c b/subsys/power/device_pm.c
index 3e1ee4b816f..f8ee03fd703 100644
--- a/subsys/power/device_pm.c
+++ b/subsys/power/device_pm.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <kernel.h>
 #include <device.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #define LOG_LEVEL CONFIG_SYS_PM_LOG_LEVEL /* From power module Kconfig */
 #include <logging/log.h>
diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c
index 1e6b18931b3..aa06968691b 100644
--- a/subsys/usb/class/mass_storage.c
+++ b/subsys/usb/class/mass_storage.c
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <string.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <disk/disk_access.h>
 #include <usb/class/usb_msc.h>
 #include <usb/usb_device.h>
diff --git a/subsys/usb/usb_descriptor.c b/subsys/usb/usb_descriptor.c
index 61721de87af..33dabb3ae4d 100644
--- a/subsys/usb/usb_descriptor.c
+++ b/subsys/usb/usb_descriptor.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <usb/usbstruct.h>
 #include <usb/usb_device.h>
 #include <usb/usb_common.h>
diff --git a/subsys/usb/usb_device.c b/subsys/usb/usb_device.c
index 36e74245c3d..f3fd9b951cf 100644
--- a/subsys/usb/usb_device.c
+++ b/subsys/usb/usb_device.c
@@ -59,7 +59,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <init.h>
 #if defined(CONFIG_USB_VBUS_GPIO)
 #include <drivers/gpio.h>
diff --git a/tests/kernel/fifo/fifo_timeout/src/main.c b/tests/kernel/fifo/fifo_timeout/src/main.c
index af34cc4997e..5c3012790b1 100644
--- a/tests/kernel/fifo/fifo_timeout/src/main.c
+++ b/tests/kernel/fifo/fifo_timeout/src/main.c
@@ -7,7 +7,7 @@
 #include <ztest.h>
 #include <irq_offload.h>
 #include <ksched.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 
 /*
diff --git a/tests/kernel/tickless/tickless/src/timestamps.c b/tests/kernel/tickless/tickless/src/timestamps.c
index a5f5800717b..db1509a6530 100644
--- a/tests/kernel/tickless/tickless/src/timestamps.c
+++ b/tests/kernel/tickless/tickless/src/timestamps.c
@@ -14,7 +14,7 @@
 
 #include <tc_util.h>
 #include <stddef.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #if defined(CONFIG_SOC_TI_LM3S6965_QEMU)
 /*
diff --git a/tests/lib/c_lib/src/main.c b/tests/lib/c_lib/src/main.c
index 6d26f134073..5e05bffb380 100644
--- a/tests/lib/c_lib/src/main.c
+++ b/tests/lib/c_lib/src/main.c
@@ -16,7 +16,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <ztest.h>
 
 #include <limits.h>
diff --git a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
index e56255f85f6..0ee047335aa 100644
--- a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
+++ b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <disk/disk_access.h>
 #include <errno.h>
 #include <init.h>