diff --git a/kernel/include/std/assert.h b/kernel/include/std/assert.h
deleted file mode 100644
index c540ac72..00000000
--- a/kernel/include/std/assert.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-#include "panic/Panic.h"
-
-#define STRINGIZE(x) #x
-#define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
-
-#define ensure(expr)                                                                                                   \
-    (bool)(expr) || panic("Check failed at " __FILE__ ", line " STRINGIZE_VALUE_OF(__LINE__) ": " #expr)
\ No newline at end of file
diff --git a/kernel/include/std/ensure.h b/kernel/include/std/ensure.h
new file mode 100644
index 00000000..8e90db85
--- /dev/null
+++ b/kernel/include/std/ensure.h
@@ -0,0 +1,9 @@
+#pragma once
+#include "panic/Panic.h"
+
+#define STRINGIZE(x) #x
+#define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
+
+// clang-format off
+#define ensure(expr) (bool)(expr) || panic("Check failed at " __FILE__ ", line " STRINGIZE_VALUE_OF(__LINE__) ": " #expr)
+// clang-format on
\ No newline at end of file
diff --git a/kernel/src/gdt/GDT.cpp b/kernel/src/gdt/GDT.cpp
index 975a9e37..23580b74 100644
--- a/kernel/src/gdt/GDT.cpp
+++ b/kernel/src/gdt/GDT.cpp
@@ -3,7 +3,7 @@
 #include "gdt/GDT.h"
 #include "log/Log.h"
 #include "memory/MemoryManager.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/string.h"
 #include <stdint.h>
 
diff --git a/kernel/src/init/Init.cpp b/kernel/src/init/Init.cpp
index da57cecd..ec20ee5f 100644
--- a/kernel/src/init/Init.cpp
+++ b/kernel/src/init/Init.cpp
@@ -16,7 +16,7 @@
 #include "rand/Mersenne.h"
 #include "render/Framebuffer.h"
 #include "render/TextRenderer.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/string.h"
 #include "utils/Time.h"
 
diff --git a/kernel/src/interrupts/Entry.cpp b/kernel/src/interrupts/Entry.cpp
index 37f86b22..d69750e6 100644
--- a/kernel/src/interrupts/Entry.cpp
+++ b/kernel/src/interrupts/Entry.cpp
@@ -8,7 +8,7 @@
 #include "memory/VMM.h"
 #include "misc/hang.h"
 #include "panic/Panic.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/stdio.h"
 #include "sys/Syscall.h"
 #include "thread/Scheduler.h"
diff --git a/kernel/src/interrupts/IDT.cpp b/kernel/src/interrupts/IDT.cpp
index 1672c629..4fba0569 100644
--- a/kernel/src/interrupts/IDT.cpp
+++ b/kernel/src/interrupts/IDT.cpp
@@ -2,7 +2,7 @@
 
 #include "interrupts/IDT.h"
 #include "log/Log.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 
 struct IDTEntry
 {
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index 959d735b..da7024ef 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -13,7 +13,7 @@
 #include "memory/Memory.h"
 #include "memory/MemoryMap.h"
 #include "misc/hang.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/stdlib.h"
 #include "thread/PIT.h"
 #include "thread/Scheduler.h"
diff --git a/kernel/src/memory/MemoryManager.cpp b/kernel/src/memory/MemoryManager.cpp
index a78df587..a087440e 100644
--- a/kernel/src/memory/MemoryManager.cpp
+++ b/kernel/src/memory/MemoryManager.cpp
@@ -8,7 +8,7 @@
 #include "memory/PMM.h"
 #include "memory/VMM.h"
 #include "misc/utils.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 
 void MemoryManager::init()
 {
diff --git a/kernel/src/memory/PMM.cpp b/kernel/src/memory/PMM.cpp
index f9b313ed..a587b8fc 100644
--- a/kernel/src/memory/PMM.cpp
+++ b/kernel/src/memory/PMM.cpp
@@ -6,7 +6,7 @@
 #include "memory/Memory.h"
 #include "memory/MemoryManager.h"
 #include "misc/utils.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/string.h"
 
 extern BOOTBOOT bootboot;
diff --git a/kernel/src/memory/VMM.cpp b/kernel/src/memory/VMM.cpp
index faa1983b..54a26e5d 100644
--- a/kernel/src/memory/VMM.cpp
+++ b/kernel/src/memory/VMM.cpp
@@ -4,7 +4,7 @@
 #include "log/Log.h"
 #include "memory/PMM.h"
 #include "misc/utils.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/string.h"
 #include "utils/Addresses.h"
 #include "utils/Registers.h"
diff --git a/kernel/src/rand/Mersenne.cpp b/kernel/src/rand/Mersenne.cpp
index 4a88e539..9f30d469 100644
--- a/kernel/src/rand/Mersenne.cpp
+++ b/kernel/src/rand/Mersenne.cpp
@@ -1,7 +1,7 @@
 #define MODULE "rand"
 
 #include "rand/Mersenne.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include <stddef.h>
 
 typedef uint64_t word_t;
diff --git a/kernel/src/sys/elf/ELFLoader.cpp b/kernel/src/sys/elf/ELFLoader.cpp
index 5219d938..347a4678 100644
--- a/kernel/src/sys/elf/ELFLoader.cpp
+++ b/kernel/src/sys/elf/ELFLoader.cpp
@@ -8,7 +8,7 @@
 #include "memory/MemoryManager.h"
 #include "memory/VMM.h"
 #include "misc/utils.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/errno.h"
 #include "std/stdlib.h"
 #include "std/string.h"
diff --git a/kernel/src/sys/exec.cpp b/kernel/src/sys/exec.cpp
index e866afe0..8a325d44 100644
--- a/kernel/src/sys/exec.cpp
+++ b/kernel/src/sys/exec.cpp
@@ -6,7 +6,7 @@
 #include "memory/MemoryManager.h"
 #include "memory/PMM.h"
 #include "memory/VMM.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/errno.h"
 #include "std/stdlib.h"
 #include "std/string.h"
diff --git a/kernel/src/thread/Scheduler.cpp b/kernel/src/thread/Scheduler.cpp
index d05c786d..224aa07f 100644
--- a/kernel/src/thread/Scheduler.cpp
+++ b/kernel/src/thread/Scheduler.cpp
@@ -10,7 +10,7 @@
 #include "misc/reboot.h"
 #include "misc/utils.h"
 #include "panic/Panic.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/errno.h"
 #include "std/stdlib.h"
 #include "std/string.h"
diff --git a/kernel/src/thread/Task.cpp b/kernel/src/thread/Task.cpp
index 1a00662c..95a450a1 100644
--- a/kernel/src/thread/Task.cpp
+++ b/kernel/src/thread/Task.cpp
@@ -3,7 +3,7 @@
 #include "thread/Task.h"
 #include "log/Log.h"
 #include "memory/VMM.h"
-#include "std/assert.h"
+#include "std/ensure.h"
 #include "std/errno.h"
 #include "std/string.h"