diff --git a/core/kprintf.c b/core/kprintf.c
index dc7cbee53ed45bf03442e3ff0cabb70de704ba03..d2cc05ed5d052844d3e0a0718b1b1393c3bfb3b6 100644
--- a/core/kprintf.c
+++ b/core/kprintf.c
@@ -2,6 +2,8 @@
  * A printf variant that prints directly to the kernel console.
  */
 
+#include <osv/debug.h>
+
 #include "../libc/stdio/stdio_impl.h"
 #include <assert.h>
 #include <limits.h>
@@ -9,7 +11,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <sys/uio.h>
-#include "debug.h"
 
 static size_t wrap_write(FILE *f, const unsigned char *buf, size_t len)
 {
diff --git a/fs/fatfs/fatfs_vfsops.c b/fs/fatfs/fatfs_vfsops.c
index ae111166d87f3b5bb7b63c80b542e6e829b662ea..f04d041311cace9d486fd8060b6fd3cae86b7c01 100644
--- a/fs/fatfs/fatfs_vfsops.c
+++ b/fs/fatfs/fatfs_vfsops.c
@@ -32,6 +32,7 @@
 #include <osv/file.h>
 #include <osv/mount.h>
 #include <osv/buf.h>
+#include <osv/debug.h>
 
 #include <sys/stat.h>
 
@@ -41,9 +42,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <stdarg.h>
 
-#include "debug.h"
 #include "fatfs.h"
 
 static int fatfs_mount	(mount_t mp, char *dev, int flags, void *data);
diff --git a/fs/vfs/main.c b/fs/vfs/main.c
index 86cfe172786e9001e7d4378100172d27097e2a21..ea9bba8e87d6cde50bcebfd00e65e32a1c25f425 100755
--- a/fs/vfs/main.c
+++ b/fs/vfs/main.c
@@ -47,7 +47,7 @@
 
 #include <osv/prex.h>
 #include <osv/vnode.h>
-#include "debug.h"
+#include <osv/debug.h>
 
 #include "vfs.h"
 
diff --git a/fs/vfs/vfs_mount.c b/fs/vfs/vfs_mount.c
index 557af5309ba1bed6a127305414a0626f9bd0d8c4..45936b44a74b4ffd5d7e834183d5379ab45b676d 100755
--- a/fs/vfs/vfs_mount.c
+++ b/fs/vfs/vfs_mount.c
@@ -45,7 +45,7 @@
 #include <osv/prex.h>
 #include <osv/vnode.h>
 #include <osv/device.h>
-#include "debug.h"
+#include <osv/debug.h>
 #include "vfs.h"
 
 /*
diff --git a/include/debug.h b/include/osv/debug.h
similarity index 89%
rename from include/debug.h
rename to include/osv/debug.h
index 46bc0d1242b4f8e917dc86d4884e2fd86a58dcf8..d1fd04d2c8c5cfd10b6920f700b284dc193c8feb 100644
--- a/include/debug.h
+++ b/include/osv/debug.h
@@ -2,6 +2,8 @@
 #define _DEBUG_H 1
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
+#include <stdarg.h>
 
 __BEGIN_DECLS
 void debug(const char *msg);
diff --git a/libc/stdio/__stdout_write.c b/libc/stdio/__stdout_write.c
index 1d2d825e1deda53b752465d3869860c710c8ac10..388f873cc14becd8c54c76d9d9a45a53f9841a27 100644
--- a/libc/stdio/__stdout_write.c
+++ b/libc/stdio/__stdout_write.c
@@ -1,7 +1,7 @@
 #include "stdio_impl.h"
 #include <termios.h>
 #include <sys/ioctl.h>
-#include "debug.h"
+#include <osv/debug.h>
 
 extern int vfs_initialized;