diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/Makefile linux-2.6.9-vs1.9.3-w02/Makefile
--- linux-2.6.9-vs1.9.3-w01/Makefile	2005-01-13 12:40:40.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/Makefile	2005-01-13 13:19:12.000000000 +0100
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 9
-EXTRAVERSION = -vs1.9.3
+EXTRAVERSION = -vs1.9.4-rc2
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/arch/i386/kernel/traps.c linux-2.6.9-vs1.9.3-w02/arch/i386/kernel/traps.c
--- linux-2.6.9-vs1.9.3-w01/arch/i386/kernel/traps.c	2004-10-23 05:05:58.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/arch/i386/kernel/traps.c	2005-01-13 13:19:12.000000000 +0100
@@ -53,6 +53,7 @@
 
 #include <linux/irq.h>
 #include <linux/module.h>
+#include <linux/vserver/debug.h>
 
 #include "mach_traps.h"
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/arch/i386/mm/init.c linux-2.6.9-vs1.9.3-w02/arch/i386/mm/init.c
--- linux-2.6.9-vs1.9.3-w01/arch/i386/mm/init.c	2004-10-23 05:05:58.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/arch/i386/mm/init.c	2005-01-13 13:19:12.000000000 +0100
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/ptrace.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/arch/x86_64/mm/init.c linux-2.6.9-vs1.9.3-w02/arch/x86_64/mm/init.c
--- linux-2.6.9-vs1.9.3-w01/arch/x86_64/mm/init.c	2004-10-23 05:06:03.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/arch/x86_64/mm/init.c	2005-01-13 13:19:12.000000000 +0100
@@ -13,7 +13,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/ptrace.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/attr.c linux-2.6.9-vs1.9.3-w02/fs/attr.c
--- linux-2.6.9-vs1.9.3-w01/fs/attr.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/attr.c	2005-01-13 13:19:12.000000000 +0100
@@ -14,9 +14,9 @@
 #include <linux/fcntl.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
-#include <linux/vs_base.h>
 #include <linux/proc_fs.h>
 #include <linux/devpts_fs.h>
+#include <linux/vserver/debug.h>
 
 /* Taken over from the old code... */
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/devpts/inode.c linux-2.6.9-vs1.9.3-w02/fs/devpts/inode.c
--- linux-2.6.9-vs1.9.3-w01/fs/devpts/inode.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/devpts/inode.c	2005-01-13 13:19:12.000000000 +0100
@@ -18,7 +18,6 @@
 #include <linux/mount.h>
 #include <linux/tty.h>
 #include <linux/devpts_fs.h>
-#include <linux/vs_base.h>
 #include "xattr.h"
 
 static struct vfsmount *devpts_mnt;
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/ext2/balloc.c linux-2.6.9-vs1.9.3-w02/fs/ext2/balloc.c
--- linux-2.6.9-vs1.9.3-w01/fs/ext2/balloc.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/ext2/balloc.c	2005-01-13 13:19:12.000000000 +0100
@@ -16,7 +16,6 @@
 #include <linux/quotaops.h>
 #include <linux/sched.h>
 #include <linux/buffer_head.h>
-#include <linux/vs_base.h>
 #include <linux/vs_dlimit.h>
 
 /*
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/ext2/ialloc.c linux-2.6.9-vs1.9.3-w02/fs/ext2/ialloc.c
--- linux-2.6.9-vs1.9.3-w01/fs/ext2/ialloc.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/ext2/ialloc.c	2005-01-13 13:19:12.000000000 +0100
@@ -18,7 +18,6 @@
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
-#include <linux/vs_base.h>
 #include <linux/vs_dlimit.h>
 
 #include "ext2.h"
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/ext2/namei.c linux-2.6.9-vs1.9.3-w02/fs/ext2/namei.c
--- linux-2.6.9-vs1.9.3-w01/fs/ext2/namei.c	2004-08-14 12:56:01.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/fs/ext2/namei.c	2005-01-13 13:19:12.000000000 +0100
@@ -30,6 +30,7 @@
  */
 
 #include <linux/pagemap.h>
+#include <linux/vserver/xid.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/ext3/balloc.c linux-2.6.9-vs1.9.3-w02/fs/ext3/balloc.c
--- linux-2.6.9-vs1.9.3-w01/fs/ext3/balloc.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/ext3/balloc.c	2005-01-13 13:19:12.000000000 +0100
@@ -19,7 +19,6 @@
 #include <linux/ext3_jbd.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
-#include <linux/vs_base.h>
 #include <linux/vs_dlimit.h>
 
 /*
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/ext3/namei.c linux-2.6.9-vs1.9.3-w02/fs/ext3/namei.c
--- linux-2.6.9-vs1.9.3-w01/fs/ext3/namei.c	2004-10-23 05:06:16.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/fs/ext3/namei.c	2005-01-13 13:19:12.000000000 +0100
@@ -36,6 +36,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/smp_lock.h>
+#include <linux/vserver/xid.h>
 #include "xattr.h"
 #include "acl.h"
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/inode.c linux-2.6.9-vs1.9.3-w02/fs/inode.c
--- linux-2.6.9-vs1.9.3-w01/fs/inode.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/inode.c	2005-01-13 13:19:12.000000000 +0100
@@ -21,7 +21,6 @@
 #include <linux/pagemap.h>
 #include <linux/cdev.h>
 #include <linux/bootmem.h>
-#include <linux/vs_base.h>
 
 /*
  * This is needed for the following functions:
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/namei.c linux-2.6.9-vs1.9.3-w02/fs/namei.c
--- linux-2.6.9-vs1.9.3-w01/fs/namei.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/namei.c	2005-01-13 13:19:12.000000000 +0100
@@ -27,7 +27,9 @@
 #include <linux/security.h>
 #include <linux/mount.h>
 #include <linux/audit.h>
-#include <linux/vs_base.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vserver/debug.h>
 
 #include <asm/namei.h>
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/namespace.c linux-2.6.9-vs1.9.3-w02/fs/namespace.c
--- linux-2.6.9-vs1.9.3-w01/fs/namespace.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/namespace.c	2005-01-13 13:19:12.000000000 +0100
@@ -21,8 +21,8 @@
 #include <linux/namei.h>
 #include <linux/security.h>
 #include <linux/mount.h>
-#include <linux/vs_base.h>
 #include <linux/vserver/namespace.h>
+#include <linux/vserver/xid.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/nfs/dir.c linux-2.6.9-vs1.9.3-w02/fs/nfs/dir.c
--- linux-2.6.9-vs1.9.3-w01/fs/nfs/dir.c	2004-10-23 05:06:17.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/fs/nfs/dir.c	2005-01-13 13:19:12.000000000 +0100
@@ -31,6 +31,7 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
+#include <linux/vserver/xid.h>
 
 #include "delegation.h"
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/open.c linux-2.6.9-vs1.9.3-w02/fs/open.c
--- linux-2.6.9-vs1.9.3-w01/fs/open.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/open.c	2005-01-13 13:19:12.000000000 +0100
@@ -22,7 +22,6 @@
 #include <asm/uaccess.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/vs_base.h>
 #include <linux/vs_limit.h>
 #include <linux/vs_dlimit.h>
 #include <linux/vserver/xid.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/proc/array.c linux-2.6.9-vs1.9.3-w02/fs/proc/array.c
--- linux-2.6.9-vs1.9.3-w01/fs/proc/array.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/proc/array.c	2005-01-13 13:19:12.000000000 +0100
@@ -73,7 +73,6 @@
 #include <linux/highmem.h>
 #include <linux/file.h>
 #include <linux/times.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vs_cvirt.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/proc/generic.c linux-2.6.9-vs1.9.3-w02/fs/proc/generic.c
--- linux-2.6.9-vs1.9.3-w01/fs/proc/generic.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/proc/generic.c	2005-01-13 13:19:12.000000000 +0100
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/idr.h>
 #include <linux/namei.h>
-#include <linux/vs_base.h>
 #include <linux/vserver/inode.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/proc/proc_misc.c linux-2.6.9-vs1.9.3-w02/fs/proc/proc_misc.c
--- linux-2.6.9-vs1.9.3-w01/fs/proc/proc_misc.c	2005-01-13 12:40:41.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/fs/proc/proc_misc.c	2005-01-13 13:19:12.000000000 +0100
@@ -44,8 +44,6 @@
 #include <linux/jiffies.h>
 #include <linux/sysrq.h>
 #include <linux/vmalloc.h>
-#include <linux/vs_base.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -53,6 +51,8 @@
 #include <asm/tlb.h>
 #include <asm/div64.h>
 
+#include <linux/vs_cvirt.h>
+
 #define LOAD_INT(x) ((x) >> FSHIFT)
 #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
 /*
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/fs/reiserfs/namei.c linux-2.6.9-vs1.9.3-w02/fs/reiserfs/namei.c
--- linux-2.6.9-vs1.9.3-w01/fs/reiserfs/namei.c	2004-08-14 12:55:33.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/fs/reiserfs/namei.c	2005-01-13 13:19:12.000000000 +0100
@@ -19,6 +19,7 @@
 #include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/xid.h>
 
 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) i->i_nlink--;
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/include/linux/sched.h linux-2.6.9-vs1.9.3-w02/include/linux/sched.h
--- linux-2.6.9-vs1.9.3-w01/include/linux/sched.h	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/include/linux/sched.h	2005-01-13 13:19:12.000000000 +0100
@@ -29,6 +29,7 @@
 #include <linux/completion.h>
 #include <linux/pid.h>
 #include <linux/percpu.h>
+#include <linux/vs_base.h>
 
 struct exec_domain;
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/include/linux/vs_base.h linux-2.6.9-vs1.9.3-w02/include/linux/vs_base.h
--- linux-2.6.9-vs1.9.3-w01/include/linux/vs_base.h	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/include/linux/vs_base.h	2005-01-13 13:19:12.000000000 +0100
@@ -1,6 +1,7 @@
 #ifndef _VX_VS_BASE_H
 #define _VX_VS_BASE_H
 
+
 #include "vserver/context.h"
 
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/include/linux/vserver/network.h linux-2.6.9-vs1.9.3-w02/include/linux/vserver/network.h
--- linux-2.6.9-vs1.9.3-w01/include/linux/vserver/network.h	2005-01-13 13:18:53.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/include/linux/vserver/network.h	2005-01-13 13:19:12.000000000 +0100
@@ -1,19 +1,21 @@
 #ifndef _VX_NETWORK_H
 #define _VX_NETWORK_H
 
+#include <linux/types.h>
+
+
 #define MAX_N_CONTEXT	65535	/* Arbitrary limit */
 
 #define NX_DYNAMIC_ID	((uint32_t)-1)		/* id for dynamic context */
 
 #define NB_IPV4ROOT	16
 
+
 #ifdef	__KERNEL__
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
-#include <linux/utsname.h>
 #include <linux/rcupdate.h>
-#include <asm/resource.h>
 #include <asm/atomic.h>
 
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/include/linux/vserver.h linux-2.6.9-vs1.9.3-w02/include/linux/vserver.h
--- linux-2.6.9-vs1.9.3-w01/include/linux/vserver.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/include/linux/vserver.h	2005-01-13 13:19:12.000000000 +0100
@@ -0,0 +1,3 @@
+
+#warning I am evil, please remove me ...
+
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/include/net/af_unix.h linux-2.6.9-vs1.9.3-w02/include/net/af_unix.h
--- linux-2.6.9-vs1.9.3-w01/include/net/af_unix.h	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/include/net/af_unix.h	2005-01-13 13:19:12.000000000 +0100
@@ -1,7 +1,6 @@
 #ifndef __LINUX_NET_AFUNIX_H
 #define __LINUX_NET_AFUNIX_H
 
-#include <linux/vs_base.h>
 
 extern void unix_inflight(struct file *fp);
 extern void unix_notinflight(struct file *fp);
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/include/net/route.h linux-2.6.9-vs1.9.3-w02/include/net/route.h
--- linux-2.6.9-vs1.9.3-w01/include/net/route.h	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/include/net/route.h	2005-01-13 13:19:12.000000000 +0100
@@ -33,7 +33,6 @@
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/ipc/msg.c linux-2.6.9-vs1.9.3-w02/ipc/msg.c
--- linux-2.6.9-vs1.9.3-w01/ipc/msg.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/ipc/msg.c	2005-01-13 13:19:12.000000000 +0100
@@ -24,7 +24,6 @@
 #include <linux/list.h>
 #include <linux/security.h>
 #include <linux/sched.h>
-#include <linux/vs_base.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/ipc/sem.c linux-2.6.9-vs1.9.3-w02/ipc/sem.c
--- linux-2.6.9-vs1.9.3-w01/ipc/sem.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/ipc/sem.c	2005-01-13 13:19:12.000000000 +0100
@@ -71,7 +71,6 @@
 #include <linux/time.h>
 #include <linux/smp_lock.h>
 #include <linux/security.h>
-#include <linux/vs_base.h>
 
 #include <asm/uaccess.h>
 #include "util.h"
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/ipc/shm.c linux-2.6.9-vs1.9.3-w02/ipc/shm.c
--- linux-2.6.9-vs1.9.3-w01/ipc/shm.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/ipc/shm.c	2005-01-13 13:19:12.000000000 +0100
@@ -26,7 +26,6 @@
 #include <linux/proc_fs.h>
 #include <linux/shmem_fs.h>
 #include <linux/security.h>
-#include <linux/vs_base.h>
 
 #include <asm/uaccess.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/ipc/util.c linux-2.6.9-vs1.9.3-w02/ipc/util.c
--- linux-2.6.9-vs1.9.3-w01/ipc/util.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/ipc/util.c	2005-01-13 13:19:12.000000000 +0100
@@ -24,7 +24,6 @@
 #include <linux/security.h>
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
-#include <linux/vs_base.h>
 
 #include <asm/unistd.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/printk.c linux-2.6.9-vs1.9.3-w02/kernel/printk.c
--- linux-2.6.9-vs1.9.3-w01/kernel/printk.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/printk.c	2005-01-13 13:19:12.000000000 +0100
@@ -30,7 +30,6 @@
 #include <linux/smp.h>
 #include <linux/security.h>
 #include <linux/bootmem.h>
-#include <linux/vs_base.h>
 
 #include <asm/uaccess.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/sched.c linux-2.6.9-vs1.9.3-w02/kernel/sched.c
--- linux-2.6.9-vs1.9.3-w01/kernel/sched.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/sched.c	2005-01-13 13:19:12.000000000 +0100
@@ -43,13 +43,12 @@
 #include <linux/kthread.h>
 #include <linux/seq_file.h>
 #include <linux/times.h>
-#include <linux/vserver/sched.h>
-#include <linux/vs_base.h>
-#include <linux/vs_context.h>
-#include <linux/vs_cvirt.h>
 #include <asm/tlb.h>
 
 #include <asm/unistd.h>
+#include <linux/vs_context.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_sched.h>
 
 #ifdef CONFIG_NUMA
 #define cpu_to_node_mask(cpu) node_to_cpumask(cpu_to_node(cpu))
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/sys.c linux-2.6.9-vs1.9.3-w02/kernel/sys.c
--- linux-2.6.9-vs1.9.3-w01/kernel/sys.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/sys.c	2005-01-13 13:19:12.000000000 +0100
@@ -24,7 +24,6 @@
 #include <linux/security.h>
 #include <linux/dcookies.h>
 #include <linux/suspend.h>
-#include <linux/vs_base.h>
 #include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/dlimit.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/dlimit.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/dlimit.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/dlimit.c	2005-01-13 13:19:12.000000000 +0100
@@ -15,7 +15,6 @@
 #include <linux/namei.h>
 #include <linux/statfs.h>
 #include <linux/vserver/switch.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_dlimit.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/helper.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/helper.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/helper.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/helper.c	2005-01-13 13:19:12.000000000 +0100
@@ -13,8 +13,7 @@
 #include <linux/errno.h>
 #include <linux/reboot.h>
 #include <linux/kmod.h>
-#include <linux/vserver.h>
-#include <linux/vs_base.h>
+#include <linux/sched.h>
 #include <linux/vs_context.h>
 
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/init.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/init.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/init.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/init.c	2005-01-13 13:19:12.000000000 +0100
@@ -11,7 +11,6 @@
 
 #include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/vserver.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/inode.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/inode.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/inode.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/inode.c	2005-01-13 13:19:12.000000000 +0100
@@ -10,12 +10,15 @@
  */
 
 #include <linux/config.h>
-#include <linux/vs_base.h>
+#include <linux/sched.h>
 #include <linux/vs_context.h>
-#include <linux/fs.h>
 #include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
 #include <linux/namei.h>
+#include <linux/mount.h>
+#include <linux/parser.h>
 #include <linux/vserver/inode.h>
+#include <linux/vserver/xid.h>
 
 #include <asm/errno.h>
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/legacy.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/legacy.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/legacy.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/legacy.c	2005-01-13 13:19:12.000000000 +0100
@@ -12,13 +12,11 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
-#include <linux/namespace.h>
-#include <linux/vserver/legacy.h>
-#include <linux/vserver/namespace.h>
-#include <linux/vserver.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
+#include <linux/vserver/legacy.h>
+#include <linux/vserver/namespace.h>
+#include <linux/namespace.h>
 
 #include <asm/errno.h>
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/namespace.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/namespace.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/namespace.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/namespace.c	2005-01-13 13:19:12.000000000 +0100
@@ -12,11 +12,11 @@
 
 #include <linux/config.h>
 #include <linux/utsname.h>
-#include <linux/vserver/namespace.h>
-#include <linux/vs_base.h>
+#include <linux/sched.h>
 #include <linux/vs_context.h>
-#include <linux/namespace.h>
+#include <linux/vserver/namespace.h>
 #include <linux/dcache.h>
+#include <linux/mount.h>
 #include <linux/fs.h>
 
 #include <asm/errno.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/signal.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/signal.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/signal.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/signal.c	2005-01-13 13:19:12.000000000 +0100
@@ -15,7 +15,6 @@
 #include <asm/errno.h>
 #include <asm/uaccess.h>
 
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vserver/signal.h>
 
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/switch.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/switch.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/switch.c	2005-01-13 13:18:53.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/switch.c	2005-01-13 13:19:12.000000000 +0100
@@ -33,6 +33,7 @@ vc_get_version(uint32_t id)
 #include <linux/vserver/limit_cmd.h>
 #include <linux/vserver/network_cmd.h>
 #include <linux/vserver/sched_cmd.h>
+#include <linux/vserver/debug_cmd.h>
 
 #include <linux/vserver/legacy.h>
 #include <linux/vserver/namespace.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/kernel/vserver/sysctl.c linux-2.6.9-vs1.9.3-w02/kernel/vserver/sysctl.c
--- linux-2.6.9-vs1.9.3-w01/kernel/vserver/sysctl.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/kernel/vserver/sysctl.c	2005-01-13 13:19:12.000000000 +0100
@@ -11,7 +11,6 @@
 
 #include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/vserver.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/ctype.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/mm/page_alloc.c linux-2.6.9-vs1.9.3-w02/mm/page_alloc.c
--- linux-2.6.9-vs1.9.3-w01/mm/page_alloc.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/mm/page_alloc.c	2005-01-13 13:19:12.000000000 +0100
@@ -31,7 +31,6 @@
 #include <linux/topology.h>
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
-#include <linux/vs_base.h>
 #include <linux/vs_limit.h>
 
 #include <asm/tlbflush.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/mm/swapfile.c linux-2.6.9-vs1.9.3-w02/mm/swapfile.c
--- linux-2.6.9-vs1.9.3-w01/mm/swapfile.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/mm/swapfile.c	2005-01-13 13:19:12.000000000 +0100
@@ -29,7 +29,6 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <linux/swapops.h>
-#include <linux/vs_base.h>
 #include <linux/vs_memory.h>
 
 spinlock_t swaplock = SPIN_LOCK_UNLOCKED;
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/net/core/dev.c linux-2.6.9-vs1.9.3-w02/net/core/dev.c
--- linux-2.6.9-vs1.9.3-w01/net/core/dev.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/net/core/dev.c	2005-01-13 13:19:12.000000000 +0100
@@ -112,9 +112,8 @@
 #include <linux/wireless.h>		/* Note : will define WIRELESS_EXT */
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
-#include <asm/current.h>
-#include <linux/vs_base.h>
 #include <linux/vs_network.h>
+#include <asm/current.h>
 
 /* This define, if set, will randomly drop a packet when congestion
  * is more than moderate.  It helps fairness in the multi-interface
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/net/ipv4/ipvs/ip_vs_ctl.c linux-2.6.9-vs1.9.3-w02/net/ipv4/ipvs/ip_vs_ctl.c
--- linux-2.6.9-vs1.9.3-w01/net/ipv4/ipvs/ip_vs_ctl.c	2004-08-14 12:56:15.000000000 +0200
+++ linux-2.6.9-vs1.9.3-w02/net/ipv4/ipvs/ip_vs_ctl.c	2005-01-13 13:19:12.000000000 +0100
@@ -23,12 +23,10 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/fs.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
 #include <linux/timer.h>
 #include <linux/swap.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 #include <linux/netfilter.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/net/ipv4/tcp_minisocks.c linux-2.6.9-vs1.9.3-w02/net/ipv4/tcp_minisocks.c
--- linux-2.6.9-vs1.9.3-w01/net/ipv4/tcp_minisocks.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/net/ipv4/tcp_minisocks.c	2005-01-13 13:19:12.000000000 +0100
@@ -25,12 +25,13 @@
 #include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/workqueue.h>
-#include <linux/vs_limit.h>
-#include <linux/vs_socket.h>
 #include <net/tcp.h>
 #include <net/inet_common.h>
 #include <net/xfrm.h>
 
+#include <linux/vs_limit.h>
+#include <linux/vs_socket.h>
+
 #ifdef CONFIG_SYSCTL
 #define SYNC_INIT 0 /* let the user enable it */
 #else
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/net/netlink/af_netlink.c linux-2.6.9-vs1.9.3-w02/net/netlink/af_netlink.c
--- linux-2.6.9-vs1.9.3-w01/net/netlink/af_netlink.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/net/netlink/af_netlink.c	2005-01-13 13:19:12.000000000 +0100
@@ -44,7 +44,6 @@
 #include <linux/smp_lock.h>
 #include <linux/notifier.h>
 #include <linux/security.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vs_limit.h>
diff -NurpP --minimal linux-2.6.9-vs1.9.3-w01/net/socket.c linux-2.6.9-vs1.9.3-w02/net/socket.c
--- linux-2.6.9-vs1.9.3-w01/net/socket.c	2005-01-13 12:40:42.000000000 +0100
+++ linux-2.6.9-vs1.9.3-w02/net/socket.c	2005-01-13 13:19:12.000000000 +0100
@@ -93,7 +93,6 @@
 
 #include <net/sock.h>
 #include <linux/netfilter.h>
-#include <linux/vs_base.h>
 #include <linux/vs_socket.h>
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);