From 07080dcbc238fbd28562d46bf57a497618617d0f Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 26 Aug 2022 23:44:47 +0200
Subject: [PATCH] misc: blib.h -> misc.h

---
 common/console.c                    | 2 +-
 common/drivers/disk.s2.c            | 2 +-
 common/drivers/edid.c               | 2 +-
 common/drivers/gop.c                | 2 +-
 common/drivers/serial.s2.c          | 2 +-
 common/drivers/vbe.c                | 2 +-
 common/drivers/vga_textmode.c       | 2 +-
 common/entry.s2.c                   | 2 +-
 common/entry.s3.c                   | 2 +-
 common/fs/ext2.s2.c                 | 2 +-
 common/fs/fat32.s2.c                | 2 +-
 common/fs/file.s2.c                 | 2 +-
 common/fs/iso9660.s2.c              | 2 +-
 common/lib/acpi.c                   | 2 +-
 common/lib/bmp.c                    | 2 +-
 common/lib/config.c                 | 2 +-
 common/lib/elf.c                    | 2 +-
 common/lib/elsewhere.c              | 2 +-
 common/lib/gterm.c                  | 2 +-
 common/lib/guid.c                   | 2 +-
 common/lib/image.c                  | 2 +-
 common/lib/libc.s2.c                | 2 +-
 common/lib/{blib.c => misc.c}       | 2 +-
 common/lib/{blib.h => misc.h}       | 4 ++--
 common/lib/{blib.s2.c => misc.s2.c} | 2 +-
 common/lib/panic.s2.c               | 2 +-
 common/lib/part.s2.c                | 2 +-
 common/lib/print.s2.c               | 2 +-
 common/lib/rand.c                   | 2 +-
 common/lib/readline.c               | 2 +-
 common/lib/term.c                   | 2 +-
 common/lib/term.s2.c                | 2 +-
 common/lib/time.c                   | 2 +-
 common/lib/trace.s2.c               | 2 +-
 common/lib/uri.c                    | 2 +-
 common/menu.c                       | 2 +-
 common/mm/pmm.s2.c                  | 2 +-
 common/mm/vmm.c                     | 2 +-
 common/protos/chainload.c           | 2 +-
 common/protos/chainload_next.c      | 2 +-
 common/protos/limine.c              | 2 +-
 common/protos/linux.c               | 2 +-
 common/protos/multiboot.h           | 2 +-
 common/protos/multiboot1.c          | 2 +-
 common/protos/multiboot2.c          | 4 ++--
 common/pxe/pxe.s2.c                 | 2 +-
 common/pxe/tftp.s2.c                | 2 +-
 common/sys/e820.s2.c                | 2 +-
 common/sys/exceptions.s2.c          | 2 +-
 common/sys/idt.c                    | 2 +-
 common/sys/idt.s2.c                 | 2 +-
 common/sys/lapic.c                  | 2 +-
 common/sys/pic.c                    | 2 +-
 common/sys/smp.c                    | 2 +-
 54 files changed, 56 insertions(+), 56 deletions(-)
 rename common/lib/{blib.c => misc.c} (99%)
 rename common/lib/{blib.h => misc.h} (98%)
 rename common/lib/{blib.s2.c => misc.s2.c} (99%)

diff --git a/common/console.c b/common/console.c
index 4f1c3023..a0b099fd 100644
--- a/common/console.c
+++ b/common/console.c
@@ -7,7 +7,7 @@
 #include <lib/print.h>
 #include <lib/readline.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/term.h>
 #include <lib/part.h>
 #include <lib/config.h>
diff --git a/common/drivers/disk.s2.c b/common/drivers/disk.s2.c
index c879ce6b..66bb03ef 100644
--- a/common/drivers/disk.s2.c
+++ b/common/drivers/disk.s2.c
@@ -8,7 +8,7 @@
 #elif uefi == 1
 #  include <efi.h>
 #endif
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <lib/rand.h>
 #include <mm/pmm.h>
diff --git a/common/drivers/edid.c b/common/drivers/edid.c
index f1247325..c8cf95a4 100644
--- a/common/drivers/edid.c
+++ b/common/drivers/edid.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <drivers/edid.h>
 #include <mm/pmm.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/print.h>
 
diff --git a/common/drivers/gop.c b/common/drivers/gop.c
index be1674ca..2226ba5a 100644
--- a/common/drivers/gop.c
+++ b/common/drivers/gop.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <efi.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/term.h>
 #include <drivers/gop.h>
 #include <drivers/edid.h>
diff --git a/common/drivers/serial.s2.c b/common/drivers/serial.s2.c
index 4141dc4c..ac14ad08 100644
--- a/common/drivers/serial.s2.c
+++ b/common/drivers/serial.s2.c
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <drivers/serial.h>
 #include <sys/cpu.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #if uefi == 1
 #  include <efi.h>
 #endif
diff --git a/common/drivers/vbe.c b/common/drivers/vbe.c
index 0f341691..f16925f1 100644
--- a/common/drivers/vbe.c
+++ b/common/drivers/vbe.c
@@ -6,7 +6,7 @@
 #include <drivers/vbe.h>
 #include <drivers/edid.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/real.h>
 #include <lib/print.h>
 #include <lib/image.h>
diff --git a/common/drivers/vga_textmode.c b/common/drivers/vga_textmode.c
index 225f779c..1a51cb36 100644
--- a/common/drivers/vga_textmode.c
+++ b/common/drivers/vga_textmode.c
@@ -7,7 +7,7 @@
 #include <sys/cpu.h>
 #include <lib/real.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/term.h>
 #include <mm/pmm.h>
 
diff --git a/common/entry.s2.c b/common/entry.s2.c
index 986c838f..4d05c4ef 100644
--- a/common/entry.s2.c
+++ b/common/entry.s2.c
@@ -4,7 +4,7 @@
 #include <stdnoreturn.h>
 #include <lib/term.h>
 #include <lib/real.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/part.h>
 #include <lib/config.h>
diff --git a/common/entry.s3.c b/common/entry.s3.c
index d10dc5fa..fc6a6b78 100644
--- a/common/entry.s3.c
+++ b/common/entry.s3.c
@@ -3,7 +3,7 @@
 #include <stdnoreturn.h>
 #include <lib/term.h>
 #include <lib/real.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/part.h>
 #include <lib/config.h>
diff --git a/common/fs/ext2.s2.c b/common/fs/ext2.s2.c
index d57ad0e6..9afeb4bd 100644
--- a/common/fs/ext2.s2.c
+++ b/common/fs/ext2.s2.c
@@ -4,7 +4,7 @@
 #include <fs/ext2.h>
 #include <drivers/disk.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <mm/pmm.h>
 
diff --git a/common/fs/fat32.s2.c b/common/fs/fat32.s2.c
index 98892998..9c781036 100644
--- a/common/fs/fat32.s2.c
+++ b/common/fs/fat32.s2.c
@@ -1,5 +1,5 @@
 #include <fs/fat32.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <drivers/disk.h>
 #include <lib/libc.h>
 #include <lib/print.h>
diff --git a/common/fs/file.s2.c b/common/fs/file.s2.c
index bf37f513..704237b1 100644
--- a/common/fs/file.s2.c
+++ b/common/fs/file.s2.c
@@ -5,7 +5,7 @@
 #include <fs/fat32.h>
 #include <fs/iso9660.h>
 #include <lib/print.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <mm/pmm.h>
 #include <lib/part.h>
 #include <lib/libc.h>
diff --git a/common/fs/iso9660.s2.c b/common/fs/iso9660.s2.c
index 6a01bfce..8aac409d 100644
--- a/common/fs/iso9660.s2.c
+++ b/common/fs/iso9660.s2.c
@@ -1,5 +1,5 @@
 #include <fs/iso9660.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <mm/pmm.h>
 
diff --git a/common/lib/acpi.c b/common/lib/acpi.c
index 301e99dd..c1a1ad95 100644
--- a/common/lib/acpi.c
+++ b/common/lib/acpi.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <lib/acpi.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/print.h>
 
diff --git a/common/lib/bmp.c b/common/lib/bmp.c
index c7ad75db..0a8cb37f 100644
--- a/common/lib/bmp.c
+++ b/common/lib/bmp.c
@@ -3,7 +3,7 @@
 #include <lib/image.h>
 #include <lib/bmp.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <mm/pmm.h>
 
 struct bmp_header {
diff --git a/common/lib/config.c b/common/lib/config.c
index f64a20dd..8ae6765b 100644
--- a/common/lib/config.c
+++ b/common/lib/config.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <lib/config.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <mm/pmm.h>
 #include <fs/file.h>
 #include <lib/print.h>
diff --git a/common/lib/elf.c b/common/lib/elf.c
index 5030c217..ae4c5f36 100644
--- a/common/lib/elf.c
+++ b/common/lib/elf.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <sys/cpu.h>
 #include <lib/libc.h>
 #include <lib/elf.h>
diff --git a/common/lib/elsewhere.c b/common/lib/elsewhere.c
index 063a538d..62bbeb67 100644
--- a/common/lib/elsewhere.c
+++ b/common/lib/elsewhere.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <lib/elsewhere.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <mm/pmm.h>
 
 static bool elsewhere_overlap_check(uint64_t base1, uint64_t top1,
diff --git a/common/lib/gterm.c b/common/lib/gterm.c
index 5152af30..0b68dd2d 100644
--- a/common/lib/gterm.c
+++ b/common/lib/gterm.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <lib/gterm.h>
 #include <lib/term.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/config.h>
 #include <lib/print.h>
diff --git a/common/lib/guid.c b/common/lib/guid.c
index e6c635da..2e9f4746 100644
--- a/common/lib/guid.c
+++ b/common/lib/guid.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <lib/guid.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 bool is_valid_guid(const char *s) {
     for (size_t i = 0; ; i++) {
diff --git a/common/lib/image.c b/common/lib/image.c
index 5e6f480b..bc2d0319 100644
--- a/common/lib/image.c
+++ b/common/lib/image.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <lib/config.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <mm/pmm.h>
 #include <lib/bmp.h>
 
diff --git a/common/lib/libc.s2.c b/common/lib/libc.s2.c
index 1b818135..34f93a1f 100644
--- a/common/lib/libc.s2.c
+++ b/common/lib/libc.s2.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <lib/libc.h>
 #include <stdbool.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 bool isprint(int c) {
     return c >= ' ' && c <= '~';
diff --git a/common/lib/blib.c b/common/lib/misc.c
similarity index 99%
rename from common/lib/blib.c
rename to common/lib/misc.c
index c6d7f635..a0bf75dd 100644
--- a/common/lib/blib.c
+++ b/common/lib/misc.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <lib/trace.h>
 #include <lib/real.h>
diff --git a/common/lib/blib.h b/common/lib/misc.h
similarity index 98%
rename from common/lib/blib.h
rename to common/lib/misc.h
index 5a82f4c8..8e8d50ef 100644
--- a/common/lib/blib.h
+++ b/common/lib/misc.h
@@ -1,5 +1,5 @@
-#ifndef __LIB__BLIB_H__
-#define __LIB__BLIB_H__
+#ifndef __LIB__MISC_H__
+#define __LIB__MISC_H__
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/common/lib/blib.s2.c b/common/lib/misc.s2.c
similarity index 99%
rename from common/lib/blib.s2.c
rename to common/lib/misc.s2.c
index 079581b2..25039631 100644
--- a/common/lib/blib.s2.c
+++ b/common/lib/misc.s2.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 
 bool verbose = true;
diff --git a/common/lib/panic.s2.c b/common/lib/panic.s2.c
index 47b07c93..c2387263 100644
--- a/common/lib/panic.s2.c
+++ b/common/lib/panic.s2.c
@@ -7,7 +7,7 @@
 #if uefi == 1
 #   include <efi.h>
 #endif
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/readline.h>
 #include <lib/gterm.h>
 #include <lib/term.h>
diff --git a/common/lib/part.s2.c b/common/lib/part.s2.c
index 63ef7603..e236af00 100644
--- a/common/lib/part.s2.c
+++ b/common/lib/part.s2.c
@@ -6,7 +6,7 @@
 #  include <lib/real.h>
 #endif
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <mm/pmm.h>
 #include <fs/file.h>
diff --git a/common/lib/print.s2.c b/common/lib/print.s2.c
index 05d540aa..799d4093 100644
--- a/common/lib/print.s2.c
+++ b/common/lib/print.s2.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <lib/print.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/term.h>
 #include <lib/libc.h>
 #if bios == 1
diff --git a/common/lib/rand.c b/common/lib/rand.c
index 4149fccf..6d34ce1f 100644
--- a/common/lib/rand.c
+++ b/common/lib/rand.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <lib/rand.h>
 #include <sys/cpu.h>
diff --git a/common/lib/readline.c b/common/lib/readline.c
index 119e1181..651d22d4 100644
--- a/common/lib/readline.c
+++ b/common/lib/readline.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <lib/readline.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/term.h>
 #include <lib/print.h>
 #if bios == 1
diff --git a/common/lib/term.c b/common/lib/term.c
index b9a62c36..c236e782 100644
--- a/common/lib/term.c
+++ b/common/lib/term.c
@@ -4,7 +4,7 @@
 #include <lib/term.h>
 #include <lib/real.h>
 #include <lib/image.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/gterm.h>
 #include <drivers/vga_textmode.h>
 #include <lib/print.h>
diff --git a/common/lib/term.s2.c b/common/lib/term.s2.c
index 15f6e323..a23bd047 100644
--- a/common/lib/term.s2.c
+++ b/common/lib/term.s2.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <lib/term.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/real.h>
 
 bool early_term = false;
diff --git a/common/lib/time.c b/common/lib/time.c
index 7678a07d..8052b9e9 100644
--- a/common/lib/time.c
+++ b/common/lib/time.c
@@ -6,7 +6,7 @@
 #elif uefi == 1
 #  include <efi.h>
 #endif
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 // Julian date calculation from https://en.wikipedia.org/wiki/Julian_day
 static uint64_t get_jdn(uint8_t days, uint8_t months, uint16_t years) {
diff --git a/common/lib/trace.s2.c b/common/lib/trace.s2.c
index 5fdac159..8f40ebda 100644
--- a/common/lib/trace.s2.c
+++ b/common/lib/trace.s2.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <lib/trace.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/config.h>
 #include <lib/print.h>
 #include <lib/uri.h>
diff --git a/common/lib/uri.c b/common/lib/uri.c
index b2f765ab..22245259 100644
--- a/common/lib/uri.c
+++ b/common/lib/uri.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <lib/uri.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/part.h>
 #include <lib/libc.h>
 #include <fs/file.h>
diff --git a/common/menu.c b/common/menu.c
index feba27da..cf34814f 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -5,7 +5,7 @@
 #include <config.h>
 #include <menu.h>
 #include <lib/print.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/config.h>
 #include <lib/term.h>
diff --git a/common/mm/pmm.s2.c b/common/mm/pmm.s2.c
index e37340f4..07af2e5b 100644
--- a/common/mm/pmm.s2.c
+++ b/common/mm/pmm.s2.c
@@ -4,7 +4,7 @@
 #include <mm/pmm.h>
 #include <sys/e820.h>
 #include <lib/acpi.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/libc.h>
 #include <lib/print.h>
 #if uefi == 1
diff --git a/common/mm/vmm.c b/common/mm/vmm.c
index a3d787ba..a1103572 100644
--- a/common/mm/vmm.c
+++ b/common/mm/vmm.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <mm/vmm.h>
 #include <mm/pmm.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <sys/cpu.h>
 
diff --git a/common/protos/chainload.c b/common/protos/chainload.c
index eee0f681..a60aa9b8 100644
--- a/common/protos/chainload.c
+++ b/common/protos/chainload.c
@@ -4,7 +4,7 @@
 #include <protos/chainload.h>
 #include <lib/part.h>
 #include <lib/config.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <drivers/disk.h>
 #include <lib/term.h>
 #include <lib/fb.h>
diff --git a/common/protos/chainload_next.c b/common/protos/chainload_next.c
index 37a4315d..05d62f66 100644
--- a/common/protos/chainload_next.c
+++ b/common/protos/chainload_next.c
@@ -3,7 +3,7 @@
 #include <stdnoreturn.h>
 #include <protos/chainload_next.h>
 #include <protos/chainload.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <lib/part.h>
 
diff --git a/common/protos/limine.c b/common/protos/limine.c
index 32655b00..a899bb02 100644
--- a/common/protos/limine.c
+++ b/common/protos/limine.c
@@ -4,7 +4,7 @@
 #include <stdnoreturn.h>
 #include <config.h>
 #include <lib/elf.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/acpi.h>
 #include <lib/config.h>
 #include <lib/time.h>
diff --git a/common/protos/linux.c b/common/protos/linux.c
index cdd2180b..89132aca 100644
--- a/common/protos/linux.c
+++ b/common/protos/linux.c
@@ -6,7 +6,7 @@
 #include <protos/linux.h>
 #include <fs/file.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/real.h>
 #include <lib/term.h>
 #include <lib/config.h>
diff --git a/common/protos/multiboot.h b/common/protos/multiboot.h
index b2683c83..b595caac 100644
--- a/common/protos/multiboot.h
+++ b/common/protos/multiboot.h
@@ -2,7 +2,7 @@
 #define __PROTOS__MULTIBOOT_H__
 
 #include <stdint.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 struct mb_reloc_stub {
     char jmp[4];
diff --git a/common/protos/multiboot1.c b/common/protos/multiboot1.c
index 1e137d42..763e2d1b 100644
--- a/common/protos/multiboot1.c
+++ b/common/protos/multiboot1.c
@@ -8,7 +8,7 @@
 #include <config.h>
 #include <lib/libc.h>
 #include <lib/elf.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/config.h>
 #include <lib/print.h>
 #include <lib/uri.h>
diff --git a/common/protos/multiboot2.c b/common/protos/multiboot2.c
index b21b4fda..f5ae0630 100644
--- a/common/protos/multiboot2.c
+++ b/common/protos/multiboot2.c
@@ -8,7 +8,7 @@
 #include <config.h>
 #include <lib/libc.h>
 #include <lib/elf.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/config.h>
 #include <lib/print.h>
 #include <lib/uri.h>
@@ -22,7 +22,7 @@
 #include <mm/vmm.h>
 #include <lib/acpi.h>
 #include <mm/pmm.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <drivers/vga_textmode.h>
 
 #define LIMINE_BRAND "Limine " LIMINE_VERSION
diff --git a/common/pxe/pxe.s2.c b/common/pxe/pxe.s2.c
index 0b229802..72f6a9f0 100644
--- a/common/pxe/pxe.s2.c
+++ b/common/pxe/pxe.s2.c
@@ -4,7 +4,7 @@
 #include <lib/real.h>
 #include <pxe/pxe.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <mm/pmm.h>
 
 void set_pxe_fp(uint32_t fp);
diff --git a/common/pxe/tftp.s2.c b/common/pxe/tftp.s2.c
index 25b00c17..33e72550 100644
--- a/common/pxe/tftp.s2.c
+++ b/common/pxe/tftp.s2.c
@@ -6,7 +6,7 @@
 #include <lib/print.h>
 #include <lib/libc.h>
 #include <mm/pmm.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 uint32_t get_boot_server_info(void) {
     struct pxenv_get_cached_info cachedinfo = { 0 };
diff --git a/common/sys/e820.s2.c b/common/sys/e820.s2.c
index 1658f1b7..aae955c5 100644
--- a/common/sys/e820.s2.c
+++ b/common/sys/e820.s2.c
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <sys/e820.h>
 #include <lib/real.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <mm/pmm.h>
 
diff --git a/common/sys/exceptions.s2.c b/common/sys/exceptions.s2.c
index ec80564d..a3551a3b 100644
--- a/common/sys/exceptions.s2.c
+++ b/common/sys/exceptions.s2.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/trace.h>
 #include <lib/print.h>
 
diff --git a/common/sys/idt.c b/common/sys/idt.c
index 7804dc5b..0bacf94f 100644
--- a/common/sys/idt.c
+++ b/common/sys/idt.c
@@ -7,7 +7,7 @@
 #include <sys/pic.h>
 #include <sys/lapic.h>
 #include <mm/pmm.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 static struct idt_entry *dummy_idt = NULL;
 
diff --git a/common/sys/idt.s2.c b/common/sys/idt.s2.c
index e5baf3e9..88894147 100644
--- a/common/sys/idt.s2.c
+++ b/common/sys/idt.s2.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/idt.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 #if bios == 1
 
diff --git a/common/sys/lapic.c b/common/sys/lapic.c
index 3d63d464..cb348968 100644
--- a/common/sys/lapic.c
+++ b/common/sys/lapic.c
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <sys/lapic.h>
 #include <sys/cpu.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/acpi.h>
 #include <mm/pmm.h>
 
diff --git a/common/sys/pic.c b/common/sys/pic.c
index 36b59750..0c9dcee0 100644
--- a/common/sys/pic.c
+++ b/common/sys/pic.c
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <sys/pic.h>
 #include <sys/cpu.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 void pic_eoi(int irq) {
     if (irq >= 8) {
diff --git a/common/sys/smp.c b/common/sys/smp.c
index 6dace9b6..a35d9b89 100644
--- a/common/sys/smp.c
+++ b/common/sys/smp.c
@@ -4,7 +4,7 @@
 #include <lib/libc.h>
 #include <lib/acpi.h>
 #include <sys/cpu.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <sys/smp.h>
 #include <sys/lapic.h>