diff --git a/common/fs/echfs.s2.c b/common/fs/echfs.s2.c
index 5c68682a..79c846cd 100644
--- a/common/fs/echfs.s2.c
+++ b/common/fs/echfs.s2.c
@@ -1,10 +1,11 @@
-#include <fs/echfs.h>
 #include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <fs/echfs.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 #include <lib/print.h>
 #include <drivers/disk.h>
-#include <stdbool.h>
 #include <mm/pmm.h>
 
 struct echfs_dir_entry {
diff --git a/common/fs/ntfs.s2.c b/common/fs/ntfs.s2.c
index b187c4db..b3316b3c 100644
--- a/common/fs/ntfs.s2.c
+++ b/common/fs/ntfs.s2.c
@@ -5,7 +5,7 @@
 #include <mm/pmm.h>
 #include <lib/print.h>
 #include <lib/libc.h>
-#include <lib/blib.h>
+#include <lib/misc.h>
 
 // created using documentation from:
 //  https://dubeyko.com/development/FileSystems/NTFS/ntfsdoc.pdf
diff --git a/common/protos/stivale.c b/common/protos/stivale.c
index feb5a42e..3602c1f0 100644
--- a/common/protos/stivale.c
+++ b/common/protos/stivale.c
@@ -5,7 +5,7 @@
 #include <protos/stivale.h>
 #include <lib/libc.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/stivale2.c b/common/protos/stivale2.c
index 172bb15c..e92009fb 100644
--- a/common/protos/stivale2.c
+++ b/common/protos/stivale2.c
@@ -5,7 +5,7 @@
 #include <protos/stivale.h>
 #include <protos/stivale2.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>
@@ -65,10 +65,10 @@
     r; \
 })
 
-#define append_tag(S, TAG) ({                              \
+#define append_tag(S, TAG) do {                            \
     (TAG)->next = (S)->tags;                               \
     (S)->tags   = REPORTED_ADDR((uint64_t)(uintptr_t)TAG); \
-})
+} while (0)
 
 #if defined (__i386__)
 extern symbol stivale2_term_write_entry;