util: remove unused includes

Remove these includes as they're not needed in this header. Instead,
the includes should go where they're actually being used.

BRANCH=none
BUG=b:240574048
TEST=make buildall -j
TEST=zmake build -a

Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: I64b10af3216654b2a20caa1cabd267661a0bca39
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3791980
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Commit-Queue: Tristan Honscheid <honscheid@google.com>

175 files changed, 182 insertions, 14 deletions

diff --git a/baseboard/kukui/battery_bq27541.c b/baseboard/kukui/battery_bq27541.c
index 465b4cea29..281fb13b78 100644
--- a/baseboard/kukui/battery_bq27541.c
+++ b/baseboard/kukui/battery_bq27541.c
@@ -6,6 +6,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "charger_mt6370.h"
 #include "console.h"
diff --git a/baseboard/kukui/battery_max17055.c b/baseboard/kukui/battery_max17055.c
index 8f196019b0..4293ba70f4 100644
--- a/baseboard/kukui/battery_max17055.c
+++ b/baseboard/kukui/battery_max17055.c
@@ -6,6 +6,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "charger_mt6370.h"
 #include "console.h"
diff --git a/baseboard/mtscp-rv32i/baseboard.c b/baseboard/mtscp-rv32i/baseboard.c
index 9a81125c40..b9e8f11b14 100644
--- a/baseboard/mtscp-rv32i/baseboard.c
+++ b/baseboard/mtscp-rv32i/baseboard.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "csr.h"
 #include "hooks.h"
+#include "panic.h"
 #include "registers.h"
 
 #define SCP_SRAM_END (CONFIG_IPC_SHARED_OBJ_ADDR & (~(0x400 - 1)))
diff --git a/board/atlas/board.c b/board/atlas/board.c
index 9b888e0cac..9617006094 100644
--- a/board/atlas/board.c
+++ b/board/atlas/board.c
@@ -29,6 +29,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "motion_sense.h"
+#include "panic.h"
 #include "power_button.h"
 #include "power.h"
 #include "pwm_chip.h"
diff --git a/board/bellis/board.c b/board/bellis/board.c
index 1a318cffdc..fa1e808c94 100644
--- a/board/bellis/board.c
+++ b/board/bellis/board.c
@@ -31,6 +31,7 @@
 #include "keyboard_scan.h"
 #include "keyboard_backlight.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/brask/board.c b/board/brask/board.c
index ee0db446c4..50ced8af47 100644
--- a/board/brask/board.c
+++ b/board/brask/board.c
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 
 #include "adc.h"
-#include "assert.h"
+#include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/burnet/board.c b/board/burnet/board.c
index 4da6597adc..055cff8c3c 100644
--- a/board/burnet/board.c
+++ b/board/burnet/board.c
@@ -34,6 +34,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/cerise/board.c b/board/cerise/board.c
index 8e3783e055..6dc393fbfc 100644
--- a/board/cerise/board.c
+++ b/board/cerise/board.c
@@ -30,6 +30,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/coral/board.c b/board/coral/board.c
index 1f1a024c14..445546828b 100644
--- a/board/coral/board.c
+++ b/board/coral/board.c
@@ -33,6 +33,7 @@
 #include "math_util.h"
 #include "motion_sense.h"
 #include "motion_lid.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/damu/board.c b/board/damu/board.c
index 0e44099f56..0b8812866c 100644
--- a/board/damu/board.c
+++ b/board/damu/board.c
@@ -30,6 +30,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/dewatt/board.c b/board/dewatt/board.c
index bcb61ca0fc..be7e51914f 100644
--- a/board/dewatt/board.c
+++ b/board/dewatt/board.c
@@ -9,6 +9,7 @@
 #include "base_fw_config.h"
 #include "battery.h"
 #include "board_fw_config.h"
+#include "builtin/assert.h"
 #include "button.h"
 #include "charger.h"
 #include "common.h"
diff --git a/board/eve/board.c b/board/eve/board.c
index ed8be66c85..009beda658 100644
--- a/board/eve/board.c
+++ b/board/eve/board.c
@@ -38,6 +38,7 @@
 #include "math_util.h"
 #include "motion_lid.h"
 #include "motion_sense.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/fennel/board.c b/board/fennel/board.c
index 74b3e4e720..279bff059c 100644
--- a/board/fennel/board.c
+++ b/board/fennel/board.c
@@ -33,6 +33,7 @@
 #include "keyboard_scan.h"
 #include "keyboard_backlight.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/guybrush/board.c b/board/guybrush/board.c
index e2f799e064..019d68da22 100644
--- a/board/guybrush/board.c
+++ b/board/guybrush/board.c
@@ -8,6 +8,7 @@
 #include "adc.h"
 #include "base_fw_config.h"
 #include "board_fw_config.h"
+#include "builtin/assert.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/icarus/board.c b/board/icarus/board.c
index 762a1c7c31..04f01fb032 100644
--- a/board/icarus/board.c
+++ b/board/icarus/board.c
@@ -26,6 +26,7 @@
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index 64878e6aff..b248b26f76 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -32,6 +32,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/jinlon/thermal.c b/board/jinlon/thermal.c
index a62adf6ea2..3ce641d202 100644
--- a/board/jinlon/thermal.c
+++ b/board/jinlon/thermal.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/board/kakadu/board.c b/board/kakadu/board.c
index 9a65319efe..97a96e25c2 100644
--- a/board/kakadu/board.c
+++ b/board/kakadu/board.c
@@ -27,6 +27,7 @@
 #include "host_command.h"
 #include "i2c.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/kappa/board.c b/board/kappa/board.c
index 266a2cccf5..6610ee647f 100644
--- a/board/kappa/board.c
+++ b/board/kappa/board.c
@@ -30,6 +30,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/katsu/board.c b/board/katsu/board.c
index e68d3b2fa0..12945e70c3 100644
--- a/board/katsu/board.c
+++ b/board/katsu/board.c
@@ -26,6 +26,7 @@
 #include "host_command.h"
 #include "i2c.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/kinox/board.c b/board/kinox/board.c
index 6384f0d1a6..4524ac0fa7 100644
--- a/board/kinox/board.c
+++ b/board/kinox/board.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/kodama/board.c b/board/kodama/board.c
index 8ced756a83..eb8069ab4a 100644
--- a/board/kodama/board.c
+++ b/board/kodama/board.c
@@ -25,6 +25,7 @@
 #include "i2c.h"
 #include "i2c_bitbang.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/kukui/board.c b/board/kukui/board.c
index 2379ef2456..91c6f0192a 100644
--- a/board/kukui/board.c
+++ b/board/kukui/board.c
@@ -27,6 +27,7 @@
 #include "host_command.h"
 #include "i2c.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/kuldax/board.c b/board/kuldax/board.c
index cd3ed8e58b..953d1da6da 100644
--- a/board/kuldax/board.c
+++ b/board/kuldax/board.c
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 
 #include "adc.h"
-#include "assert.h"
+#include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/makomo/board.c b/board/makomo/board.c
index 378376bf92..4c88d630bb 100644
--- a/board/makomo/board.c
+++ b/board/makomo/board.c
@@ -31,6 +31,7 @@
 #include "keyboard_scan.h"
 #include "keyboard_backlight.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/moli/board.c b/board/moli/board.c
index 93cb64d4a0..63a9d62abb 100644
--- a/board/moli/board.c
+++ b/board/moli/board.c
@@ -4,7 +4,7 @@
  */
 
 #include "adc.h"
-#include "assert.h"
+#include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/morphius/thermal.c b/board/morphius/thermal.c
index fa54eabe5e..a5618bbd8f 100644
--- a/board/morphius/thermal.c
+++ b/board/morphius/thermal.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/board/munna/board.c b/board/munna/board.c
index 488848ce5f..229dbe55e4 100644
--- a/board/munna/board.c
+++ b/board/munna/board.c
@@ -31,6 +31,7 @@
 #include "keyboard_scan.h"
 #include "keyboard_backlight.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/nautilus/board.c b/board/nautilus/board.c
index 7e0cc17930..3b05dc6fb7 100644
--- a/board/nautilus/board.c
+++ b/board/nautilus/board.c
@@ -35,6 +35,7 @@
 #include "motion_lid.h"
 #include "motion_sense.h"
 #include "pi3usb9281.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "spi.h"
diff --git a/board/nocturne/board.c b/board/nocturne/board.c
index e4c703847f..92c676f26b 100644
--- a/board/nocturne/board.c
+++ b/board/nocturne/board.c
@@ -30,6 +30,7 @@
 #include "lpc.h"
 #include "mkbp_event.h"
 #include "motion_sense.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/phaser/board.c b/board/phaser/board.c
index 92c5f9f84b..df950371c8 100644
--- a/board/phaser/board.c
+++ b/board/phaser/board.c
@@ -6,6 +6,7 @@
 /* Phaser board-specific configuration */
 
 #include "adc.h"
+#include "builtin/stdnoreturn.h"
 #include "button.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/board/pico/board.c b/board/pico/board.c
index 309f51df27..30d5d4beb7 100644
--- a/board/pico/board.c
+++ b/board/pico/board.c
@@ -28,6 +28,7 @@
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/board/poppy/board.c b/board/poppy/board.c
index 5e8e38faf7..2a35b4df9d 100644
--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -34,6 +34,7 @@
 #include "math_util.h"
 #include "motion_lid.h"
 #include "motion_sense.h"
+#include "panic.h"
 #include "pi3usb9281.h"
 #include "power.h"
 #include "power_button.h"
diff --git a/board/rammus/board.c b/board/rammus/board.c
index 6fcae701db..9c47838758 100644
--- a/board/rammus/board.c
+++ b/board/rammus/board.c
@@ -39,6 +39,7 @@
 #include "math_util.h"
 #include "motion_lid.h"
 #include "motion_sense.h"
+#include "panic.h"
 #include "pi3usb9281.h"
 #include "power.h"
 #include "power_button.h"
diff --git a/board/redrix/thermal.c b/board/redrix/thermal.c
index 4dfbcf9c86..6187fa3464 100644
--- a/board/redrix/thermal.c
+++ b/board/redrix/thermal.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/board/reef/board.c b/board/reef/board.c
index 0902da3584..98231cabd9 100644
--- a/board/reef/board.c
+++ b/board/reef/board.c
@@ -34,6 +34,7 @@
 #include "math_util.h"
 #include "motion_sense.h"
 #include "motion_lid.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c
index ccd2aac7ca..36e81b9ea8 100644
--- a/board/reef_it8320/board.c
+++ b/board/reef_it8320/board.c
@@ -29,6 +29,7 @@
 #include "math_util.h"
 #include "motion_sense.h"
 #include "motion_lid.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c
index 8fe85f70f7..92d34b3a20 100644
--- a/board/reef_mchp/board.c
+++ b/board/reef_mchp/board.c
@@ -35,6 +35,7 @@
 #include "math_util.h"
 #include "motion_sense.h"
 #include "motion_lid.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index 0ea2d89c73..169851c95d 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -24,6 +24,7 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/stern/board.c b/board/stern/board.c
index a8ba476dff..6399d421a8 100644
--- a/board/stern/board.c
+++ b/board/stern/board.c
@@ -30,6 +30,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "pwm.h"
diff --git a/board/vell/board.c b/board/vell/board.c
index ba60c65373..85f0927cad 100644
--- a/board/vell/board.c
+++ b/board/vell/board.c
@@ -17,6 +17,7 @@
 #include "fw_config.h"
 #include "hooks.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power_button.h"
 #include "power.h"
 #include "registers.h"
diff --git a/board/willow/board.c b/board/willow/board.c
index 9cb384f05c..355056e35b 100644
--- a/board/willow/board.c
+++ b/board/willow/board.c
@@ -30,6 +30,7 @@
 #include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "panic.h"
 #include "power.h"
 #include "power_button.h"
 #include "registers.h"
diff --git a/chip/host/flash.c b/chip/host/flash.c
index 5d895222e7..7f20a80939 100644
--- a/chip/host/flash.c
+++ b/chip/host/flash.c
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "config_chip.h"
 #include "flash.h"
diff --git a/chip/host/persistence.c b/chip/host/persistence.c
index d23615d1ec..d4535e3512 100644
--- a/chip/host/persistence.c
+++ b/chip/host/persistence.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "builtin/assert.h"
 #include "util.h"
 
 /* The longest path in a chroot seems to be about 280 characters (as of
diff --git a/chip/host/system.c b/chip/host/system.c
index 0a362a0ffd..511c6d29de 100644
--- a/chip/host/system.c
+++ b/chip/host/system.c
@@ -5,6 +5,7 @@
 
 /* System module for emulator */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "ec_commands.h"
 #include "host_test.h"
diff --git a/chip/host/uart.c b/chip/host/uart.c
index 4c8474bcaa..cc40e516fa 100644
--- a/chip/host/uart.c
+++ b/chip/host/uart.c
@@ -11,6 +11,7 @@
 #include <termio.h>
 #include <unistd.h>
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "queue.h"
 #include "task.h"
diff --git a/chip/host/usb_pd_phy.c b/chip/host/usb_pd_phy.c
index eb77c1eecd..1543418249 100644
--- a/chip/host/usb_pd_phy.c
+++ b/chip/host/usb_pd_phy.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "crc.h"
diff --git a/chip/ish/heci.c b/chip/ish/heci.c
index 6adcece752..c0ba042512 100644
--- a/chip/ish/heci.c
+++ b/chip/ish/heci.c
@@ -4,6 +4,7 @@
  */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "compile_time_macros.h"
 #include "console.h"
 #include "hbm.h"
diff --git a/chip/ish/ipc_heci.c b/chip/ish/ipc_heci.c
index 84dbba9866..bd9b170f29 100644
--- a/chip/ish/ipc_heci.c
+++ b/chip/ish/ipc_heci.c
@@ -23,6 +23,7 @@
  *  - Doorbell Clear Status Register (DB CSR)
  */
 
+#include "builtin/assert.h"
 #include "registers.h"
 #include "console.h"
 #include "task.h"
diff --git a/chip/it83xx/gpio.c b/chip/it83xx/gpio.c
index 99603c26a5..4b6bfaee57 100644
--- a/chip/it83xx/gpio.c
+++ b/chip/it83xx/gpio.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/chip/it83xx/i2c.c b/chip/it83xx/i2c.c
index 7dc41a7eb4..ba9d5fc034 100644
--- a/chip/it83xx/i2c.c
+++ b/chip/it83xx/i2c.c
@@ -5,6 +5,7 @@
 
 /* I2C module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/it83xx/peci.c b/chip/it83xx/peci.c
index d485b3fccf..4eb97b3853 100644
--- a/chip/it83xx/peci.c
+++ b/chip/it83xx/peci.c
@@ -5,6 +5,7 @@
 
 /* PECI interface for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "hooks.h"
 #include "peci.h"
diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c
index 2d6778b910..28a2de1b56 100644
--- a/chip/it83xx/system.c
+++ b/chip/it83xx/system.c
@@ -14,6 +14,7 @@
 #include "host_command.h"
 #include "intc.h"
 #include "link_defs.h"
+#include "panic.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
diff --git a/chip/mec1322/clock.c b/chip/mec1322/clock.c
index 04ee90ee98..f541af53cc 100644
--- a/chip/mec1322/clock.c
+++ b/chip/mec1322/clock.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c
index 58215adae7..ab73483bd2 100644
--- a/chip/mec1322/i2c.c
+++ b/chip/mec1322/i2c.c
@@ -5,6 +5,7 @@
 
 /* I2C port module for MEC1322 */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c
index 3045cd6cff..095308a88b 100644
--- a/chip/mec1322/system.c
+++ b/chip/mec1322/system.c
@@ -5,6 +5,7 @@
 
 /* System module for Chrome EC : MEC1322 hardware specific implementation */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/mt_scp/mt818x/clock_mt8186.c b/chip/mt_scp/mt818x/clock_mt8186.c
index f7a4954232..6cfbde0ec5 100644
--- a/chip/mt_scp/mt818x/clock_mt8186.c
+++ b/chip/mt_scp/mt818x/clock_mt8186.c
@@ -5,6 +5,7 @@
 
 /* Clocks, PLL and power settings */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock_chip.h"
 #include "common.h"
diff --git a/chip/mt_scp/mt818x/system.c b/chip/mt_scp/mt818x/system.c
index 6184b75c27..6e6a8e1e1c 100644
--- a/chip/mt_scp/mt818x/system.c
+++ b/chip/mt_scp/mt818x/system.c
@@ -5,6 +5,7 @@
 
 /* System : hardware specific implementation */
 
+#include "builtin/assert.h"
 #include "clock_chip.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c
index 3067258bb2..9fa39d4176 100644
--- a/chip/npcx/flash.c
+++ b/chip/npcx/flash.c
@@ -5,6 +5,7 @@
 
 /* Flash memory module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "flash.h"
 #include "host_command.h"
 #include "registers.h"
diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c
index 55310b1ebf..cae7b13fd2 100644
--- a/chip/npcx/gpio.c
+++ b/chip/npcx/gpio.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio.h"
 #include "gpio_chip.h"
diff --git a/chip/npcx/pwm.c b/chip/npcx/pwm.c
index de39da52a1..905a7bcb25 100644
--- a/chip/npcx/pwm.c
+++ b/chip/npcx/pwm.c
@@ -8,7 +8,7 @@
  * On this chip, the PWM logic is implemented by the hardware FAN modules.
  */
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock_chip.h"
 #include "console.h"
diff --git a/chip/npcx/sha256_chip.c b/chip/npcx/sha256_chip.c
index 0462b752ed..4a92db4bb9 100644
--- a/chip/npcx/sha256_chip.c
+++ b/chip/npcx/sha256_chip.c
@@ -5,6 +5,7 @@
  */
 
 /* SHA256 module for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "sha256.h"
 #include "util.h"
diff --git a/chip/npcx/shi.c b/chip/npcx/shi.c
index 4e7553a8f9..5867a0b658 100644
--- a/chip/npcx/shi.c
+++ b/chip/npcx/shi.c
@@ -10,6 +10,7 @@
  * This uses Input/Output buffer to handle SPI transmission and reception.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "console.h"
diff --git a/chip/npcx/system-npcx5.c b/chip/npcx/system-npcx5.c
index 2fffacd055..b5e2582655 100644
--- a/chip/npcx/system-npcx5.c
+++ b/chip/npcx/system-npcx5.c
@@ -6,6 +6,7 @@
 #include <stdnoreturn.h>
 
 /* System module driver depends on chip series for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/system-npcx7.c b/chip/npcx/system-npcx7.c
index b3a8aec6fd..c0cc748e1c 100644
--- a/chip/npcx/system-npcx7.c
+++ b/chip/npcx/system-npcx7.c
@@ -6,6 +6,7 @@
 #include <stdnoreturn.h>
 
 /* System module driver depends on chip series for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/system-npcx9.c b/chip/npcx/system-npcx9.c
index b3a8aec6fd..c0cc748e1c 100644
--- a/chip/npcx/system-npcx9.c
+++ b/chip/npcx/system-npcx9.c
@@ -6,6 +6,7 @@
 #include <stdnoreturn.h>
 
 /* System module driver depends on chip series for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index 47909a5f54..c10ce9a01d 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -5,6 +5,7 @@
 
 /* System module for Chrome EC : NPCX hardware specific implementation */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock_chip.h"
 #include "common.h"
@@ -15,6 +16,7 @@
 #include "host_command.h"
 #include "hwtimer_chip.h"
 #include "lct_chip.h"
+#include "panic.h"
 #include "registers.h"
 #include "rom_chip.h"
 #include "sib_chip.h"
diff --git a/chip/stm32/clock-f.c b/chip/stm32/clock-f.c
index 3fdc3bcc43..953c793245 100644
--- a/chip/stm32/clock-f.c
+++ b/chip/stm32/clock-f.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-f.h"
diff --git a/chip/stm32/clock-stm32f4.c b/chip/stm32/clock-stm32f4.c
index 6d8461afc1..1ea7b83ad0 100644
--- a/chip/stm32/clock-stm32f4.c
+++ b/chip/stm32/clock-stm32f4.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-f.h"
diff --git a/chip/stm32/clock-stm32g4.c b/chip/stm32/clock-stm32g4.c
index a46946e22b..da8c0b063d 100644
--- a/chip/stm32/clock-stm32g4.c
+++ b/chip/stm32/clock-stm32g4.c
@@ -5,6 +5,7 @@
 
 /* Clocks configuration routines */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-f.h"
diff --git a/chip/stm32/clock-stm32h7.c b/chip/stm32/clock-stm32h7.c
index bb73d5dc0c..09cf24e3a3 100644
--- a/chip/stm32/clock-stm32h7.c
+++ b/chip/stm32/clock-stm32h7.c
@@ -15,6 +15,7 @@
 
 #include <stdbool.h>
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/clock-stm32l4.c b/chip/stm32/clock-stm32l4.c
index a4227cbc9f..034e0c7dea 100644
--- a/chip/stm32/clock-stm32l4.c
+++ b/chip/stm32/clock-stm32l4.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings for STM32L4xx as well as STM32L5xx. */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-l4.h"
diff --git a/chip/stm32/dma.c b/chip/stm32/dma.c
index e2804ed41d..a36e015ce9 100644
--- a/chip/stm32/dma.c
+++ b/chip/stm32/dma.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/stm32/flash-f.c b/chip/stm32/flash-f.c
index edbb1fd0db..caa2737099 100644
--- a/chip/stm32/flash-f.c
+++ b/chip/stm32/flash-f.c
@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include "battery.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "clock.h"
 #include "flash.h"
diff --git a/chip/stm32/flash-stm32l.c b/chip/stm32/flash-stm32l.c
index 592f8f50bf..a36fb8e439 100644
--- a/chip/stm32/flash-stm32l.c
+++ b/chip/stm32/flash-stm32l.c
@@ -5,9 +5,11 @@
 
 /* Flash memory module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "console.h"
 #include "flash.h"
+#include "panic.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
diff --git a/chip/stm32/gpio-f0-l.c b/chip/stm32/gpio-f0-l.c
index 51691ba3be..f583e66acc 100644
--- a/chip/stm32/gpio-f0-l.c
+++ b/chip/stm32/gpio-f0-l.c
@@ -9,6 +9,7 @@
  * These functions are shared by the STM32F0 and STM32L variants.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio_chip.h"
 #include "registers.h"
diff --git a/chip/stm32/gpio-stm32f4.c b/chip/stm32/gpio-stm32f4.c
index 9726bd277f..d95a96ae5b 100644
--- a/chip/stm32/gpio-stm32f4.c
+++ b/chip/stm32/gpio-stm32f4.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/chip/stm32/gpio-stm32g4.c b/chip/stm32/gpio-stm32g4.c
index ce4baf4313..54f31ba468 100644
--- a/chip/stm32/gpio-stm32g4.c
+++ b/chip/stm32/gpio-stm32g4.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/chip/stm32/hwtimer.c b/chip/stm32/hwtimer.c
index 652e822f09..2c96cd7b7f 100644
--- a/chip/stm32/hwtimer.c
+++ b/chip/stm32/hwtimer.c
@@ -5,6 +5,7 @@
 
 /* Hardware timers driver */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock-f.h"
 #include "common.h"
diff --git a/chip/stm32/hwtimer32.c b/chip/stm32/hwtimer32.c
index 4a263e72d9..6d0fb86d18 100644
--- a/chip/stm32/hwtimer32.c
+++ b/chip/stm32/hwtimer32.c
@@ -5,6 +5,7 @@
 
 /* Hardware 32-bit timer driver */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock-f.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32f0.c b/chip/stm32/i2c-stm32f0.c
index 7120144c4a..ade084d301 100644
--- a/chip/stm32/i2c-stm32f0.c
+++ b/chip/stm32/i2c-stm32f0.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32f3.c b/chip/stm32/i2c-stm32f3.c
index 7120144c4a..ade084d301 100644
--- a/chip/stm32/i2c-stm32f3.c
+++ b/chip/stm32/i2c-stm32f3.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32f4.c b/chip/stm32/i2c-stm32f4.c
index 11b6cc2f76..cdf4f3d1bd 100644
--- a/chip/stm32/i2c-stm32f4.c
+++ b/chip/stm32/i2c-stm32f4.c
@@ -4,6 +4,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32g4.c b/chip/stm32/i2c-stm32g4.c
index 4da300f45c..995cbdd7c5 100644
--- a/chip/stm32/i2c-stm32g4.c
+++ b/chip/stm32/i2c-stm32g4.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c
index 582266b14d..c5eff18684 100644
--- a/chip/stm32/i2c-stm32l.c
+++ b/chip/stm32/i2c-stm32l.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32l4.c b/chip/stm32/i2c-stm32l4.c
index 851adad21c..99db878bd0 100644
--- a/chip/stm32/i2c-stm32l4.c
+++ b/chip/stm32/i2c-stm32l4.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "printf.h"
 #include "chipset.h"
 #include "clock.h"
diff --git a/chip/stm32/power_led.c b/chip/stm32/power_led.c
index ab5f2dcd34..d30e742ca1 100644
--- a/chip/stm32/power_led.c
+++ b/chip/stm32/power_led.c
@@ -15,6 +15,7 @@
  * results in a breathing effect. It takes about 2sec for a full cycle.
  */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/chip/stm32/pwm.c b/chip/stm32/pwm.c
index aadbde08c2..719d4af156 100644
--- a/chip/stm32/pwm.c
+++ b/chip/stm32/pwm.c
@@ -5,6 +5,7 @@
 
 /* PWM control module for STM32 */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock-f.h"
 #include "gpio.h"
diff --git a/chip/stm32/spi.c b/chip/stm32/spi.c
index 5d78e9c89a..ca1f4ba6f1 100644
--- a/chip/stm32/spi.c
+++ b/chip/stm32/spi.c
@@ -8,6 +8,7 @@
  * This uses DMA to handle transmission and reception.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "console.h"
diff --git a/chip/stm32/usb_dwc.c b/chip/stm32/usb_dwc.c
index 75d15dc48f..7201cb8406 100644
--- a/chip/stm32/usb_dwc.c
+++ b/chip/stm32/usb_dwc.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "config.h"
diff --git a/chip/stm32/usb_pd_phy.c b/chip/stm32/usb_pd_phy.c
index 62c18200a9..6acbd09dcf 100644
--- a/chip/stm32/usb_pd_phy.c
+++ b/chip/stm32/usb_pd_phy.c
@@ -4,6 +4,7 @@
  */
 
 #include "adc.h"
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/bluetooth_le.c b/common/bluetooth_le.c
index 631ab5d0e0..d9a43a74da 100644
--- a/common/bluetooth_le.c
+++ b/common/bluetooth_le.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "bluetooth_le.h"
 #include "util.h"
 #include "console.h"
diff --git a/common/charge_manager.c b/common/charge_manager.c
index 676c4d283e..3958e64147 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -6,6 +6,7 @@
 #include "adc.h"
 #include "atomic.h"
 #include "battery.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
 #include "charge_state_v2.h"
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 957ecd3455..597ab6afa1 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -7,6 +7,7 @@
 
 #include "battery.h"
 #include "battery_smart.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charger_profile_override.h"
 #include "charge_state.h"
diff --git a/common/fan.c b/common/fan.c
index 1dfc9e1af5..98dda066f8 100644
--- a/common/fan.c
+++ b/common/fan.c
@@ -5,7 +5,7 @@
 
 /* Basic Chrome OS fan control */
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/flash.c b/common/flash.c
index 9dd4a1c0d2..6e3ee8f2b5 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -5,6 +5,7 @@
 
 /* Flash memory module for Chrome EC - common functions */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cros_board_info.h"
diff --git a/common/gpio.c b/common/gpio.c
index 0a7b758f21..90fb7d9445 100644
--- a/common/gpio.c
+++ b/common/gpio.c
@@ -5,6 +5,7 @@
 
 /* GPIO common functionality for Chrome EC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio.h"
 #include "ioexpander.h"
diff --git a/common/host_command.c b/common/host_command.c
index a2d8defbef..5184d6e439 100644
--- a/common/host_command.c
+++ b/common/host_command.c
@@ -6,6 +6,7 @@
 /* Host command module for Chrome EC */
 
 #include "ap_hang_detect.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "ec_commands.h"
diff --git a/common/i2c_controller.c b/common/i2c_controller.c
index 0e126a490a..e04eec6a6c 100644
--- a/common/i2c_controller.c
+++ b/common/i2c_controller.c
@@ -6,6 +6,7 @@
 /* I2C cross-platform code for Chrome EC */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "clock.h"
 #include "charge_state.h"
 #include "console.h"
diff --git a/common/ioexpander.c b/common/ioexpander.c
index f81f996c6b..7b753b2f05 100644
--- a/common/ioexpander.c
+++ b/common/ioexpander.c
@@ -5,6 +5,7 @@
 
 /* IO Expander Controller Common Code */
 
+#include "builtin/assert.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "ioexpander.h"
diff --git a/common/ioexpander_commands.c b/common/ioexpander_commands.c
index 13d7ba0690..8b12a6fa9f 100644
--- a/common/ioexpander_commands.c
+++ b/common/ioexpander_commands.c
@@ -2,6 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
+#include "builtin/assert.h"
 #include "console.h"
 #include "gpio.h"
 #include "ioexpander.h"
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c
index aebbf38e87..b1282ced91 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.c
@@ -6,6 +6,7 @@
  */
 
 #include "button.h"
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/keyboard_8042_sharedlib.c b/common/keyboard_8042_sharedlib.c
index 5a3c0e12d8..2eab9ae528 100644
--- a/common/keyboard_8042_sharedlib.c
+++ b/common/keyboard_8042_sharedlib.c
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include "builtin/assert.h"
 #include "button.h"
 #include "keyboard_8042_sharedlib.h"
 #include "keyboard_config.h"
diff --git a/common/keyboard_vivaldi.c b/common/keyboard_vivaldi.c
index 2cee4f0b9f..9d0e4f9eee 100644
--- a/common/keyboard_vivaldi.c
+++ b/common/keyboard_vivaldi.c
@@ -5,6 +5,7 @@
 
 /* Vivali Keyboard code for Chrome EC */
 
+#include "builtin/assert.h"
 #include "keyboard_8042_sharedlib.h"
 #include "keyboard_scan.h"
 #include "ec_commands.h"
diff --git a/common/main.c b/common/main.c
index 2604637ad5..52fb0823ee 100644
--- a/common/main.c
+++ b/common/main.c
@@ -29,6 +29,7 @@
 #ifdef CONFIG_MPU
 #include "mpu.h"
 #endif
+#include "panic.h"
 #include "rwsig.h"
 #include "system.h"
 #include "task.h"
diff --git a/common/motion_sense.c b/common/motion_sense.c
index 2cd1f2fe5f..80e9c24473 100644
--- a/common/motion_sense.c
+++ b/common/motion_sense.c
@@ -8,6 +8,7 @@
 #include "accelgyro.h"
 #include "atomic.h"
 #include "body_detection.h"
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/panic_output.c b/common/panic_output.c
index bba4a82f46..4bbf9bc230 100644
--- a/common/panic_output.c
+++ b/common/panic_output.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/common/printf.c b/common/printf.c
index 91e4e722b0..6bfb58dbc3 100644
--- a/common/printf.c
+++ b/common/printf.c
@@ -5,6 +5,7 @@
 
 /* Printf-like functionality for Chrome EC */
 
+#include "builtin/assert.h"
 #include "console.h"
 #include "printf.h"
 #include "timer.h"
diff --git a/common/pstore_commands.c b/common/pstore_commands.c
index ed4c8221a8..1d0ff596cb 100644
--- a/common/pstore_commands.c
+++ b/common/pstore_commands.c
@@ -5,6 +5,7 @@
 
 /* Persistent storage commands for Chrome EC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "eeprom.h"
 #include "host_command.h"
diff --git a/common/queue.c b/common/queue.c
index 8ad08c8438..af83a72ae5 100644
--- a/common/queue.c
+++ b/common/queue.c
@@ -4,6 +4,8 @@
  *
  * Queue data structure implementation.
  */
+
+#include "builtin/assert.h"
 #include "console.h"
 #include "queue.h"
 #include "util.h"
diff --git a/common/rollback.c b/common/rollback.c
index 21a0273f12..8f4e8f86e7 100644
--- a/common/rollback.c
+++ b/common/rollback.c
@@ -5,6 +5,7 @@
 
 /* Rollback protection logic. */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #ifdef CONFIG_LIBCRYPTOC
diff --git a/common/sha256.c b/common/sha256.c
index 33ed38c5ec..2826f6c68d 100644
--- a/common/sha256.c
+++ b/common/sha256.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  */
 
+#include "builtin/assert.h"
 #include "sha256.h"
 #include "util.h"
 
diff --git a/common/spi_flash.c b/common/spi_flash.c
index d7cf9fc49a..a77e8a8337 100644
--- a/common/spi_flash.c
+++ b/common/spi_flash.c
@@ -6,6 +6,7 @@
  * SPI flash driver for Chrome EC.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "host_command.h"
diff --git a/common/throttle_ap.c b/common/throttle_ap.c
index 1f50cdb597..a3b1745972 100644
--- a/common/throttle_ap.c
+++ b/common/throttle_ap.c
@@ -5,6 +5,7 @@
 
 /* Common chipset throttling code for Chrome EC */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/timer.c b/common/timer.c
index a33eb84be4..ccf77eb9be 100644
--- a/common/timer.c
+++ b/common/timer.c
@@ -6,6 +6,7 @@
 /* Timer module for Chrome EC operating system */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "hooks.h"
diff --git a/common/usb_charger.c b/common/usb_charger.c
index 3933634cbf..70861e6c62 100644
--- a/common/usb_charger.c
+++ b/common/usb_charger.c
@@ -12,6 +12,7 @@
  * is necessary to update charge_manager with detected charger attributes.
  */
 
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charger.h"
 #include "common.h"
diff --git a/common/usb_pd_alt_mode_dfp.c b/common/usb_pd_alt_mode_dfp.c
index 40535bf025..33fde9b14d 100644
--- a/common/usb_pd_alt_mode_dfp.c
+++ b/common/usb_pd_alt_mode_dfp.c
@@ -5,6 +5,7 @@
  * Alternate Mode Downstream Facing Port (DFP) USB-PD module.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 29460d083c..3b2d6b4b8f 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -4,6 +4,7 @@
  */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 946abf6395..8b52d44668 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -7,6 +7,7 @@
 #include "battery.h"
 #include "battery_smart.h"
 #include "board.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "chipset.h"
diff --git a/common/usb_port_power_smart.c b/common/usb_port_power_smart.c
index 74912de773..9313993842 100644
--- a/common/usb_port_power_smart.c
+++ b/common/usb_port_power_smart.c
@@ -5,6 +5,7 @@
 
 /* USB charging control module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/common/usbc/dp_alt_mode.c b/common/usbc/dp_alt_mode.c
index a5b4908112..1a2ae5f2a5 100644
--- a/common/usbc/dp_alt_mode.c
+++ b/common/usbc/dp_alt_mode.c
@@ -11,8 +11,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "assert.h"
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "usb_common.h"
 #include "usb_dp_alt_mode.h"
diff --git a/common/usbc/usb_pd_dpm.c b/common/usbc/usb_pd_dpm.c
index 4034140492..845bd89031 100644
--- a/common/usbc/usb_pd_dpm.c
+++ b/common/usbc/usb_pd_dpm.c
@@ -8,6 +8,7 @@
  * Refer to USB PD 3.0 spec, version 2.0, sections 8.2 and 8.3
  */
 
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "compile_time_macros.h"
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c
index 7d9318b3e3..e5ed34b989 100644
--- a/common/usbc/usb_pe_drp_sm.c
+++ b/common/usbc/usb_pe_drp_sm.c
@@ -6,6 +6,7 @@
 #include "atomic.h"
 #include "battery.h"
 #include "battery_smart.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c
index a0bf6b375e..925e61c430 100644
--- a/common/usbc/usb_prl_sm.c
+++ b/common/usbc/usb_prl_sm.c
@@ -6,6 +6,7 @@
 #include "battery.h"
 #include "battery_smart.h"
 #include "board.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "chipset.h"
diff --git a/common/usbc/usb_retimer_fw_update.c b/common/usbc/usb_retimer_fw_update.c
index a70ba18a11..157191d0a3 100644
--- a/common/usbc/usb_retimer_fw_update.c
+++ b/common/usbc/usb_retimer_fw_update.c
@@ -5,6 +5,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+
+#include "builtin/assert.h"
 #include "compile_time_macros.h"
 #include "console.h"
 #include "hooks.h"
diff --git a/common/usbc/usb_tc_ctvpd_sm.c b/common/usbc/usb_tc_ctvpd_sm.c
index cfe5a22c3a..f674e75488 100644
--- a/common/usbc/usb_tc_ctvpd_sm.c
+++ b/common/usbc/usb_tc_ctvpd_sm.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "system.h"
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
index ebb2f6f3df..50114e76b1 100644
--- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c
+++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/common/usbc/usb_tc_vpd_sm.c b/common/usbc/usb_tc_vpd_sm.c
index 11cc947cb1..e68e46e9dd 100644
--- a/common/usbc/usb_tc_vpd_sm.c
+++ b/common/usbc/usb_tc_vpd_sm.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "system.h"
diff --git a/common/usbc/usbc_task.c b/common/usbc/usbc_task.c
index 4faf36cff4..f6a2b5447d 100644
--- a/common/usbc/usbc_task.c
+++ b/common/usbc/usbc_task.c
@@ -6,6 +6,7 @@
 #include "battery.h"
 #include "battery_smart.h"
 #include "board.h"
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "chipset.h"
diff --git a/common/usbc_intr_task.c b/common/usbc_intr_task.c
index 258c068b78..e283314151 100644
--- a/common/usbc_intr_task.c
+++ b/common/usbc_intr_task.c
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/common/util.c b/common/util.c
index c89770f161..a090bd1575 100644
--- a/common/util.c
+++ b/common/util.c
@@ -5,6 +5,7 @@
 
 /* Utility functions for Chrome EC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "util.h"
diff --git a/common/vboot_hash.c b/common/vboot_hash.c
index bb51858374..aa878fedd0 100644
--- a/common/vboot_hash.c
+++ b/common/vboot_hash.c
@@ -5,6 +5,7 @@
 
 /* Verified boot hash computing module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/core/cortex-m/mpu.c b/core/cortex-m/mpu.c
index ec9ceca201..e34dfb820e 100644
--- a/core/cortex-m/mpu.c
+++ b/core/cortex-m/mpu.c
@@ -5,6 +5,7 @@
 
 /* MPU module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "mpu.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c
index 8c46bc0161..f4315f32b1 100644
--- a/core/cortex-m/task.c
+++ b/core/cortex-m/task.c
@@ -6,6 +6,7 @@
 /* Task scheduling / events module for Chrome EC operating system */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c
index 4837c2dfbd..edb8688e4a 100644
--- a/core/cortex-m0/task.c
+++ b/core/cortex-m0/task.c
@@ -6,6 +6,7 @@
 /* Task scheduling / events module for Chrome EC operating system */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/core/host/timer.c b/core/host/timer.c
index 67271c5112..8a5d6442a4 100644
--- a/core/host/timer.c
+++ b/core/host/timer.c
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include "builtin/assert.h"
 #include "task.h"
 #include "test_util.h"
 #include "timer.h"
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index 052df663bb..ade530e04c 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -13,6 +13,7 @@
 #define TEST_TASK_EXTRA_ARGS 0
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "link_defs.h"
diff --git a/core/nds32/task.c b/core/nds32/task.c
index f7b5674085..c384e291f3 100644
--- a/core/nds32/task.c
+++ b/core/nds32/task.c
@@ -6,6 +6,7 @@
 /* Task scheduling / events module for Chrome EC operating system */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
@@ -13,6 +14,7 @@
 #include "intc.h"
 #include "irq_chip.h"
 #include "link_defs.h"
+#include "panic.h"
 #include "registers.h"
 #include "task.h"
 #include "timer.h"
diff --git a/core/riscv-rv32i/task.c b/core/riscv-rv32i/task.c
index 88d888b185..fe3117d5a7 100644
--- a/core/riscv-rv32i/task.c
+++ b/core/riscv-rv32i/task.c
@@ -6,10 +6,12 @@
 /* Task scheduling / events module for Chrome EC operating system */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "cpu.h"
 #include "irq_chip.h"
 #include "link_defs.h"
+#include "panic.h"
 #include "task.h"
 #include "timer.h"
 #include "util.h"
diff --git a/driver/accel_bma2x2.c b/driver/accel_bma2x2.c
index fde60997ab..12291297ae 100644
--- a/driver/accel_bma2x2.c
+++ b/driver/accel_bma2x2.c
@@ -10,6 +10,7 @@
  */
 
 #include "accelgyro.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "accel_bma2x2.h"
diff --git a/driver/accel_bma4xx.c b/driver/accel_bma4xx.c
index 0ed15dc2ab..80352459c3 100644
--- a/driver/accel_bma4xx.c
+++ b/driver/accel_bma4xx.c
@@ -11,6 +11,7 @@
 
 #include "accelgyro.h"
 #include "accel_bma422.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "i2c.h"
diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c
index 366dadf2d0..18ed0ed0a4 100644
--- a/driver/accelgyro_bmi160.c
+++ b/driver/accelgyro_bmi160.c
@@ -9,6 +9,7 @@
  */
 
 #include "accelgyro.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "accelgyro_bmi_common.h"
diff --git a/driver/accelgyro_bmi260.c b/driver/accelgyro_bmi260.c
index 8b3f3acc13..db1ac41fca 100644
--- a/driver/accelgyro_bmi260.c
+++ b/driver/accelgyro_bmi260.c
@@ -9,6 +9,7 @@
  */
 
 #include "accelgyro.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "accelgyro_bmi_common.h"
 #include "accelgyro_bmi260.h"
diff --git a/driver/accelgyro_bmi3xx.c b/driver/accelgyro_bmi3xx.c
index 5549a6eb7b..cda5623daa 100644
--- a/driver/accelgyro_bmi3xx.c
+++ b/driver/accelgyro_bmi3xx.c
@@ -11,6 +11,7 @@
 #include "accelgyro.h"
 #include "accelgyro_bmi323.h"
 #include "accelgyro_bmi_common.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "hwtimer.h"
 #include "i2c.h"
diff --git a/driver/accelgyro_lsm6dsm.c b/driver/accelgyro_lsm6dsm.c
index fcfe38d98e..1c46c275bc 100644
--- a/driver/accelgyro_lsm6dsm.c
+++ b/driver/accelgyro_lsm6dsm.c
@@ -9,6 +9,7 @@
  * This driver supports both devices LSM6DSM and LSM6DSL
  */
 
+#include "builtin/assert.h"
 #include "driver/accelgyro_lsm6dsm.h"
 #include "driver/mag_lis2mdl.h"
 #include "hooks.h"
diff --git a/driver/battery/bq27621_g1.c b/driver/battery/bq27621_g1.c
index 76a63f7247..cd11b2f269 100644
--- a/driver/battery/bq27621_g1.c
+++ b/driver/battery/bq27621_g1.c
@@ -6,6 +6,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "extpower.h"
 #include "hooks.h"
diff --git a/driver/battery/max17055.c b/driver/battery/max17055.c
index 88d58eb659..842075b94c 100644
--- a/driver/battery/max17055.c
+++ b/driver/battery/max17055.c
@@ -6,6 +6,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "extpower.h"
 #include "hooks.h"
diff --git a/driver/bc12/max14637.c b/driver/bc12/max14637.c
index df1f887f41..f819250d6a 100644
--- a/driver/bc12/max14637.c
+++ b/driver/bc12/max14637.c
@@ -12,6 +12,7 @@
  * the system will have to charge ramp.
  */
 
+#include "builtin/assert.h"
 #include "max14637.h"
 #include "charge_manager.h"
 #include "chipset.h"
diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c
index e2475ea038..426d7b4d38 100644
--- a/driver/bc12/pi3usb9281.c
+++ b/driver/bc12/pi3usb9281.c
@@ -5,6 +5,7 @@
  * Pericom PI3USB3281 USB port switch driver.
  */
 
+#include "builtin/assert.h"
 #include "charge_manager.h"
 #include "common.h"
 #include "console.h"
diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c
index 80479523b4..896da5a523 100644
--- a/driver/charger/bd9995x.c
+++ b/driver/charger/bd9995x.c
@@ -15,6 +15,7 @@
 #include "ec_commands.h"
 #include "hooks.h"
 #include "i2c.h"
+#include "panic.h"
 #include "task.h"
 #include "time.h"
 #include "util.h"
diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c
index 1fc218dbc8..e3a67ab2b6 100644
--- a/driver/charger/isl923x.c
+++ b/driver/charger/isl923x.c
@@ -8,6 +8,7 @@
 #include "adc.h"
 #include "battery.h"
 #include "battery_smart.h"
+#include "builtin/assert.h"
 #include "charge_state_v2.h"
 #include "charger.h"
 #include "compile_time_macros.h"
diff --git a/driver/tcpm/anx7447.c b/driver/tcpm/anx7447.c
index d872cbba1d..63ff228dd5 100644
--- a/driver/tcpm/anx7447.c
+++ b/driver/tcpm/anx7447.c
@@ -5,6 +5,7 @@
 
 /* ANX7447 port manager */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "anx7447.h"
 #include "console.h"
diff --git a/driver/tcpm/it83xx.c b/driver/tcpm/it83xx.c
index cc82f16e63..33214d3373 100644
--- a/driver/tcpm/it83xx.c
+++ b/driver/tcpm/it83xx.c
@@ -5,6 +5,7 @@
 
 /* TCPM for MCU also running TCPC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "config.h"
 #include "console.h"
diff --git a/driver/tcpm/it8xxx2.c b/driver/tcpm/it8xxx2.c
index 3e634c8430..f7be071bf1 100644
--- a/driver/tcpm/it8xxx2.c
+++ b/driver/tcpm/it8xxx2.c
@@ -5,6 +5,7 @@
 
 /* TCPM on ITE chip it8xxx2 with embedded TCPC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "config.h"
 #include "console.h"
diff --git a/driver/temp_sensor/bd99992gw.c b/driver/temp_sensor/bd99992gw.c
index f74f0448b4..6de760cbcf 100644
--- a/driver/temp_sensor/bd99992gw.c
+++ b/driver/temp_sensor/bd99992gw.c
@@ -10,6 +10,7 @@
  */
 
 #include "bd99992gw.h"
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
diff --git a/driver/temp_sensor/thermistor.c b/driver/temp_sensor/thermistor.c
index 4363167aa1..194ee98923 100644
--- a/driver/temp_sensor/thermistor.c
+++ b/driver/temp_sensor/thermistor.c
@@ -9,6 +9,7 @@
  */
 
 #include "adc.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio.h"
 #include "temp_sensor/thermistor.h"
diff --git a/driver/usb_mux/usb_mux.c b/driver/usb_mux/usb_mux.c
index f8d0ed55c5..723ad5711f 100644
--- a/driver/usb_mux/usb_mux.c
+++ b/driver/usb_mux/usb_mux.c
@@ -6,6 +6,7 @@
 /* USB mux high-level driver. */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "chipset.h"
diff --git a/fuzz/host_command_fuzz.c b/fuzz/host_command_fuzz.c
index b6c4c4685f..d8d2408838 100644
--- a/fuzz/host_command_fuzz.c
+++ b/fuzz/host_command_fuzz.c
@@ -8,6 +8,7 @@
 #include <pthread.h>
 #include <sys/time.h>
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "host_command.h"
diff --git a/include/keyboard_raw.h b/include/keyboard_raw.h
index a35d39dfa2..1619c2a621 100644
--- a/include/keyboard_raw.h
+++ b/include/keyboard_raw.h
@@ -11,7 +11,7 @@
 #ifndef __CROS_EC_KEYBOARD_RAW_H
 #define __CROS_EC_KEYBOARD_RAW_H
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio_signal.h"
 #include "keyboard_config.h"
diff --git a/include/util.h b/include/util.h
index 28fdb7b9fe..567bf03866 100644
--- a/include/util.h
+++ b/include/util.h
@@ -10,9 +10,7 @@
 
 #include "common.h"
 #include "compile_time_macros.h"
-#include "panic.h"
 
-#include "builtin/assert.h" /* For ASSERT(). */
 #include <ctype.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/power/falconlite.c b/power/falconlite.c
index ce03fbbf31..0ddd310898 100644
--- a/power/falconlite.c
+++ b/power/falconlite.c
@@ -5,6 +5,7 @@
 
 /* FalconLite chipset power control module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/power/mt817x.c b/power/mt817x.c
index abaab82358..f27c960bd6 100644
--- a/power/mt817x.c
+++ b/power/mt817x.c
@@ -26,6 +26,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "chipset.h" /* ./common/chipset.c implements chipset functions too */
 #include "common.h"
 #include "gpio.h"
diff --git a/power/mt8183.c b/power/mt8183.c
index d083edc958..c0b6140ce1 100644
--- a/power/mt8183.c
+++ b/power/mt8183.c
@@ -5,6 +5,7 @@
 
 /* mt8183 chipset power control module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/power/mt8186.c b/power/mt8186.c
index 71de42a3a6..475ba769f9 100644
--- a/power/mt8186.c
+++ b/power/mt8186.c
@@ -21,8 +21,8 @@
  *  - Pressing and releaseing power within that 8s is ignored
  */
 
-#include "assert.h"
 #include "battery.h"
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/power/mt8192.c b/power/mt8192.c
index c3d0ce3267..a942153a95 100644
--- a/power/mt8192.c
+++ b/power/mt8192.c
@@ -22,6 +22,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/power/qcom.c b/power/qcom.c
index 5fcdeda98e..ed546cd976 100644
--- a/power/qcom.c
+++ b/power/qcom.c
@@ -22,6 +22,7 @@
  *  - If POWER_GOOD is dropped by the AP, then we power the AP off
  */
 
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/power/rk3288.c b/power/rk3288.c
index 6483deec71..ecdc1f2200 100644
--- a/power/rk3288.c
+++ b/power/rk3288.c
@@ -24,6 +24,7 @@
  */
 
 #include "battery.h"
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h" /* This module implements chipset functions too */
 #include "clock.h"
diff --git a/power/rk3399.c b/power/rk3399.c
index ec034e2168..1c1172c8bf 100644
--- a/power/rk3399.c
+++ b/power/rk3399.c
@@ -12,6 +12,7 @@
  * Version 1: Simplified power tree for tablet / detachable.
  */
 
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/power/sdm845.c b/power/sdm845.c
index dcb09ec266..7dc8c4d14a 100644
--- a/power/sdm845.c
+++ b/power/sdm845.c
@@ -22,6 +22,7 @@
  *  - If POWER_GOOD is dropped by the AP, then we power the AP off
  */
 
+#include "builtin/assert.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/test/aes.c b/test/aes.c
index c7517c064a..50160f38a0 100644
--- a/test/aes.c
+++ b/test/aes.c
@@ -16,6 +16,7 @@
 
 #include "aes.h"
 #include "aes-gcm.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "common.h"
 #include "test_util.h"
diff --git a/test/fpsensor_crypto.c b/test/fpsensor_crypto.c
index 85dfa97f8c..7ec54a9115 100644
--- a/test/fpsensor_crypto.c
+++ b/test/fpsensor_crypto.c
@@ -5,6 +5,7 @@
 
 #include <stdbool.h>
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "ec_commands.h"
 #include "fpsensor_crypto.h"
diff --git a/test/panic_data.c b/test/panic_data.c
index 9abbcb7745..8b8aa07460 100644
--- a/test/panic_data.c
+++ b/test/panic_data.c
@@ -5,7 +5,7 @@
 
 #include "test_util.h"
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "panic.h"
 #include "system.h"
 #include "task.h"
diff --git a/test/thermal.c b/test/thermal.c
index 69b19b7986..c79f18ab2a 100644
--- a/test/thermal.c
+++ b/test/thermal.c
@@ -5,6 +5,7 @@
  * Test thermal engine.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "driver/temp_sensor/thermistor.h"
diff --git a/third_party/sha2/sha256.c b/third_party/sha2/sha256.c
index 2d6eaa43f2..475092b1fd 100644
--- a/third_party/sha2/sha256.c
+++ b/third_party/sha2/sha256.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  */
 
+#include "builtin/assert.h"
 #include "sha256.h"
 #include "util.h"
 
diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c
index 997c28c2b9..c637c8a67e 100644
--- a/zephyr/emul/emul_bmi.c
+++ b/zephyr/emul/emul_bmi.c
@@ -13,6 +13,7 @@ LOG_MODULE_REGISTER(emul_bmi);
 #include <zephyr/drivers/emul.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/sys/__assert.h>
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_bmi.h"
@@ -720,7 +721,7 @@ static void bmi_emul_restore_nvm(const struct emul *emul)
 
 	data = emul->data;
 
-	ASSERT(data->type_data->nvm_len <= BMI_EMUL_MAX_NVM_REGS);
+	__ASSERT_NO_MSG(data->type_data->nvm_len <= BMI_EMUL_MAX_NVM_REGS);
 
 	/* Restore registers values */
 	for (i = 0; i < data->type_data->nvm_len; i++) {