diff --git a/arch/x86/include/asm/stddef.h b/arch/x86/include/asm/stddef.h
index d18c521c..b0f80bfa 100644
--- a/arch/x86/include/asm/stddef.h
+++ b/arch/x86/include/asm/stddef.h
@@ -25,6 +25,7 @@ extern "C" {
 #endif
 
 typedef unsigned int size_t;
+typedef int ssize_t;
 
 /* This defines what the stack looks like after an ISR was running */
 struct state {
diff --git a/libkern/printf.c b/libkern/printf.c
index 90bd4a67..2d3e803b 100644
--- a/libkern/printf.c
+++ b/libkern/printf.c
@@ -44,10 +44,10 @@
  * all typedefs required have been added.
  */
 
+#include <metalsvm/string.h>
+
 #define __64BIT__
 
-typedef unsigned long size_t;
-typedef long ssize_t;
 #ifdef __64BIT__
 typedef unsigned long long uintmax_t;
 typedef long long intmax_t;
@@ -63,7 +63,6 @@ typedef unsigned long long u_quad_t;
 typedef long long quad_t;
 typedef unsigned long uintptr_t;
 typedef long ptrdiff_t;
-#define NULL ((void*)0)
 #define NBBY    8		/* number of bits in a byte */
 char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 #define hex2ascii(hex)  (hex2ascii_data[hex])
@@ -73,14 +72,6 @@ char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 #define va_end __builtin_va_end
 #define toupper(c)      ((c) - 0x20 * (((c) >= 'a') && ((c) <= 'z')))
 
-static inline size_t strlen(const char *s)
-{
-	size_t l = 0;
-	while (*s++)
-		l++;
-	return l;
-}
-
 /* Max number conversion buffer length: a u_quad_t in base 2, plus NUL byte. */
 #define MAXNBUF	(sizeof(intmax_t) * NBBY + 1)