diff --git a/src/kernel/core/fs/bootfs.c b/src/kernel/core/fs/bootfs.c
index d2280448cf..b3bc899181 100755
--- a/src/kernel/core/fs/bootfs.c
+++ b/src/kernel/core/fs/bootfs.c
@@ -15,13 +15,14 @@
 #include <arch/cpu.h>
 #include <sys/stat.h>
 
-#include <bootfs.h>
-
 #include <bootdir.h>
 
 #include <string.h>
 #include <stdio.h>
 
+#include "bootfs.h"
+
+
 #define BOOTFS_TRACE 1
 
 #if BOOTFS_TRACE
diff --git a/src/kernel/core/fs/bootfs.h b/src/kernel/core/fs/bootfs.h
new file mode 100644
index 0000000000..7104320e53
--- /dev/null
+++ b/src/kernel/core/fs/bootfs.h
@@ -0,0 +1,10 @@
+/* 
+** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
+** Distributed under the terms of the NewOS License.
+*/
+#ifndef _FS_BOOTFS_H_
+#define _FS_BOOTFS_H_
+
+status_t bootstrap_bootfs(void);
+
+#endif	/* _FS_BOOTFS_H_ */
diff --git a/src/kernel/core/fs/rootfs.c b/src/kernel/core/fs/rootfs.c
index 27c68bc4c2..c1441efa01 100755
--- a/src/kernel/core/fs/rootfs.c
+++ b/src/kernel/core/fs/rootfs.c
@@ -14,11 +14,12 @@
 #include <kerrors.h>
 #include <sys/stat.h>
 
-#include <rootfs.h>
-
 #include <string.h>
 #include <stdio.h>
 
+#include "rootfs.h"
+
+
 #define ROOTFS_TRACE 1
 
 #if ROOTFS_TRACE
diff --git a/src/kernel/core/fs/rootfs.h b/src/kernel/core/fs/rootfs.h
new file mode 100644
index 0000000000..ba49ffa6cc
--- /dev/null
+++ b/src/kernel/core/fs/rootfs.h
@@ -0,0 +1,10 @@
+/* 
+** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
+** Distributed under the terms of the NewOS License.
+*/
+#ifndef _FS_ROOTFS_H_
+#define _FS_ROOTFS_H_
+
+status_t bootstrap_rootfs(void);
+
+#endif	/* _FS_ROOTFS_H_ */
diff --git a/src/kernel/core/fs/vfs.c b/src/kernel/core/fs/vfs.c
index 909a6a4d6e..a7a6c27be7 100755
--- a/src/kernel/core/fs/vfs.c
+++ b/src/kernel/core/fs/vfs.c
@@ -24,9 +24,6 @@
 #include <memheap.h>
 #include <arch/cpu.h>
 #include <elf.h>
-#include <rootfs.h>
-#include <bootfs.h>
-#include <devfs.h>
 #include <Errors.h>
 #include <kerrors.h>
 #include <atomic.h>
@@ -34,7 +31,9 @@
 
 #include <OS.h>
 
-#include <rootfs.h>
+#include <devfs.h>
+#include "rootfs.h"
+#include "bootfs.h"
 
 #include <string.h>
 #include <stdio.h>