From 5ee30664c5f1aeaaeadb77ccddbd4239343adf6f Mon Sep 17 00:00:00 2001
From: Marvin Friedrich <contact@marvinf.com>
Date: Tue, 11 Aug 2026 22:31:38 +0200
Subject: [PATCH] stuff3

---
 kernel/arch/x86_64/apic.c  | 2 +-
 kernel/arch/x86_64/hpet.c  | 2 +-
 kernel/arch/x86_64/idt.c   | 2 +-
 kernel/boot/limine/entry.c | 1 -
 kernel/boot/main.c         | 2 +-
 kernel/core/elf.c          | 2 +-
 subprojects/uacpi          | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/kernel/arch/x86_64/apic.c b/kernel/arch/x86_64/apic.c
index 7e498b0..9e669cc 100644
--- a/kernel/arch/x86_64/apic.c
+++ b/kernel/arch/x86_64/apic.c
@@ -1,8 +1,8 @@
 #include <zinnia/mem.h>
-#include <kernel/assert.h>
 #include <kernel/clock.h>
 #include <kernel/mmio.h>
 #include <kernel/percpu.h>
+#include <assert.h>
 #include <stdint.h>
 #include <x86_64/apic.h>
 #include <x86_64/asm.h>
diff --git a/kernel/arch/x86_64/hpet.c b/kernel/arch/x86_64/hpet.c
index a96c7f2..b0bc7a3 100644
--- a/kernel/arch/x86_64/hpet.c
+++ b/kernel/arch/x86_64/hpet.c
@@ -1,9 +1,9 @@
 #include <common/utils.h>
-#include <kernel/assert.h>
 #include <kernel/clock.h>
 #include <kernel/cmdline.h>
 #include <kernel/mmio.h>
 #include <kernel/print.h>
+#include <assert.h>
 #include <uacpi/acpi.h>
 #include <uacpi/status.h>
 #include <uacpi/tables.h>
diff --git a/kernel/arch/x86_64/idt.c b/kernel/arch/x86_64/idt.c
index bfb1cf9..96933d1 100644
--- a/kernel/arch/x86_64/idt.c
+++ b/kernel/arch/x86_64/idt.c
@@ -1,10 +1,10 @@
 #include <common/compiler.h>
-#include <kernel/assert.h>
 #include <kernel/irq.h>
 #include <kernel/panic.h>
 #include <kernel/percpu.h>
 #include <kernel/print.h>
 #include <kernel/sched.h>
+#include <assert.h>
 #include <bits/sched.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/kernel/boot/limine/entry.c b/kernel/boot/limine/entry.c
index 48c06ba..9bad393 100644
--- a/kernel/boot/limine/entry.c
+++ b/kernel/boot/limine/entry.c
@@ -1,6 +1,5 @@
 #include <common/utils.h>
 #include <kernel/alloc.h>
-#include <kernel/assert.h>
 #include <kernel/cmdline.h>
 #include <kernel/init.h>
 #include <kernel/print.h>
diff --git a/kernel/boot/main.c b/kernel/boot/main.c
index 090f81b..72f9dda 100644
--- a/kernel/boot/main.c
+++ b/kernel/boot/main.c
@@ -1,6 +1,5 @@
 #include <common/compiler.h>
 #include <kernel/alloc.h>
-#include <kernel/assert.h>
 #include <kernel/channel.h>
 #include <kernel/clock.h>
 #include <kernel/cmdline.h>
@@ -15,6 +14,7 @@
 #include <kernel/sched.h>
 #include <kernel/vas.h>
 #include <kernel/vmo.h>
+#include <assert.h>
 #include <config.h>
 #include <stdint.h>
 
diff --git a/kernel/core/elf.c b/kernel/core/elf.c
index 0ea390f..c559f70 100644
--- a/kernel/core/elf.c
+++ b/kernel/core/elf.c
@@ -3,7 +3,6 @@
 #include <common/elf.h>
 #include <common/utils.h>
 #include <kernel/alloc.h>
-#include <kernel/assert.h>
 #include <kernel/elf.h>
 #include <kernel/percpu.h>
 #include <kernel/pmap.h>
@@ -12,6 +11,7 @@
 #include <kernel/vas.h>
 #include <kernel/vdso.h>
 #include <kernel/vmo.h>
+#include <assert.h>
 #include <string.h>
 
 zn_status_t elf_load(struct exec_info* info, struct task** out) {
diff --git a/subprojects/uacpi b/subprojects/uacpi
index 9c9b26d..45f2505 160000
--- a/subprojects/uacpi
+++ b/subprojects/uacpi
@@ -1 +1 @@
-Subproject commit 9c9b26d6291a1cdd9014cc5bb6b03e596697cbfd
+Subproject commit 45f2505e7f8c38c0c4429a28234b00cd1f0ae300