diff --git a/src/kernel/core/fs/fd.c b/src/kernel/core/fs/fd.c
index ec1e3440a0..6d7e681c9a 100644
--- a/src/kernel/core/fs/fd.c
+++ b/src/kernel/core/fs/fd.c
@@ -1,17 +1,15 @@
 /* Operations on file descriptors
 ** 
 ** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
+** Distributed under the terms of the Haiku License.
 */
 
 
-#include <fd.h>
-
 #include <OS.h>
-#include <Errors.h>
 
+#include <fd.h>
 #include <vfs.h>
-#include <debug.h>
+#include <syscalls.h>
 
 #include <malloc.h>
 #include <string.h>
diff --git a/src/kernel/core/fs/vfs.cpp b/src/kernel/core/fs/vfs.cpp
index b21297d4d0..ba6e12d093 100755
--- a/src/kernel/core/fs/vfs.cpp
+++ b/src/kernel/core/fs/vfs.cpp
@@ -4,7 +4,7 @@
 
 /* 
 ** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
+** Distributed under the terms of the Haiku License.
 **
 ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
@@ -16,18 +16,13 @@
 #include <fs_interface.h>
 
 #include <disk_device_manager/KDiskDeviceManager.h>
-#include <kernel.h>
+#include <syscalls.h>
 #include <boot/kernel_args.h>
 #include <vfs.h>
 #include <vm.h>
 #include <vm_cache.h>
-#include <debug.h>
 #include <khash.h>
 #include <lock.h>
-#include <thread.h>
-#include <malloc.h>
-#include <arch/cpu.h>
-#include <elf.h>
 #include <kerrors.h>
 #include <fd.h>
 #include <fs/node_monitor.h>
@@ -36,6 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/resource.h>
 #include <fcntl.h>