--- linux-2.6.16-rc4/arch/alpha/mm/init.c	2006-02-18 14:39:40 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/alpha/mm/init.c	2006-02-17 23:26:32 +0100
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h> /* max_low_pfn */
 #include <linux/vmalloc.h>
+#include <linux/pagemap.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/arch/frv/mm/mmu-context.c	2005-03-02 12:38:20 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/frv/mm/mmu-context.c	2006-02-17 23:26:32 +0100
@@ -11,6 +11,7 @@
 
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/vs_pid.h>
 #include <asm/tlbflush.h>
 
 #define NR_CXN	4096
--- linux-2.6.16-rc4/arch/i386/kernel/sys_i386.c	2004-08-14 12:56:23 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/i386/kernel/sys_i386.c	2006-02-17 23:26:32 +0100
@@ -19,6 +19,7 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.16-rc4/arch/i386/kernel/traps.c	2006-02-18 14:39:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/i386/kernel/traps.c	2006-02-17 23:26:32 +0100
@@ -53,6 +53,7 @@
 #include <asm/kdebug.h>
 
 #include <linux/module.h>
+#include <linux/vserver/debug.h>
 
 #include "mach_traps.h"
 
--- linux-2.6.16-rc4/arch/ia64/ia32/sys_ia32.c	2006-02-18 14:39:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/ia64/ia32/sys_ia32.c	2006-02-17 23:26:32 +0100
@@ -52,6 +52,7 @@
 #include <linux/compat.h>
 #include <linux/vfs.h>
 #include <linux/mman.h>
+#include <linux/vs_pid.h>
 #include <linux/mutex.h>
 
 #include <asm/intrinsics.h>
--- linux-2.6.16-rc4/arch/ia64/kernel/perfmon.c	2006-02-18 14:39:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/ia64/kernel/perfmon.c	2006-02-17 23:26:32 +0100
@@ -41,6 +41,8 @@
 #include <linux/capability.h>
 #include <linux/rcupdate.h>
 #include <linux/completion.h>
+#include <linux/vs_memory.h>
+#include <linux/vs_pid.h>
 
 #include <asm/errno.h>
 #include <asm/intrinsics.h>
--- linux-2.6.16-rc4/arch/ia64/kernel/signal.c	2006-02-18 14:39:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/ia64/kernel/signal.c	2006-02-17 23:26:32 +0100
@@ -21,6 +21,7 @@
 #include <linux/binfmts.h>
 #include <linux/unistd.h>
 #include <linux/wait.h>
+#include <linux/vs_pid.h>
 
 #include <asm/ia32.h>
 #include <asm/intrinsics.h>
--- linux-2.6.16-rc4/arch/ia64/mm/fault.c	2006-01-03 17:29:09 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/ia64/mm/fault.c	2006-02-17 23:26:32 +0100
@@ -10,6 +10,7 @@
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
--- linux-2.6.16-rc4/arch/mips/kernel/syscall.c	2006-02-18 14:39:45 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/mips/kernel/syscall.c	2006-02-17 23:26:32 +0100
@@ -29,6 +29,7 @@
 #include <linux/shm.h>
 #include <linux/compiler.h>
 #include <linux/module.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/branch.h>
 #include <asm/cachectl.h>
--- linux-2.6.16-rc4/arch/mips/kernel/sysirix.c	2006-02-18 14:39:45 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/mips/kernel/sysirix.c	2006-02-17 23:26:32 +0100
@@ -31,6 +31,7 @@
 #include <linux/socket.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_pid.h>
 
 #include <asm/ptrace.h>
 #include <asm/page.h>
--- linux-2.6.16-rc4/arch/powerpc/kernel/syscalls.c	2006-02-18 14:39:46 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/powerpc/kernel/syscalls.c	2006-02-17 23:26:32 +0100
@@ -36,6 +36,7 @@
 #include <linux/file.h>
 #include <linux/init.h>
 #include <linux/personality.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.16-rc4/arch/powerpc/kernel/vdso.c	2006-01-03 17:29:13 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/powerpc/kernel/vdso.c	2006-02-17 23:26:32 +0100
@@ -25,6 +25,7 @@
 #include <linux/elf.h>
 #include <linux/security.h>
 #include <linux/bootmem.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
--- linux-2.6.16-rc4/arch/sparc/kernel/sys_sparc.c	2005-06-22 02:37:59 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/sparc/kernel/sys_sparc.c	2006-02-17 23:26:32 +0100
@@ -21,6 +21,7 @@
 #include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.16-rc4/arch/sparc64/kernel/binfmt_aout32.c	2006-02-18 14:39:49 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/sparc64/kernel/binfmt_aout32.c	2006-02-17 23:26:32 +0100
@@ -27,6 +27,7 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/arch/sparc64/kernel/sys_sparc.c	2005-08-29 22:24:56 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/sparc64/kernel/sys_sparc.c	2006-02-17 23:26:32 +0100
@@ -25,6 +25,7 @@
 #include <linux/syscalls.h>
 #include <linux/ipc.h>
 #include <linux/personality.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.16-rc4/arch/um/drivers/mconsole_kern.c	2006-02-18 14:39:49 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/um/drivers/mconsole_kern.c	2006-02-17 23:26:32 +0100
@@ -21,6 +21,7 @@
 #include "linux/proc_fs.h"
 #include "linux/syscalls.h"
 #include "linux/console.h"
+#include "linux/vs_pid.h"
 #include "asm/irq.h"
 #include "asm/uaccess.h"
 #include "user_util.h"
--- linux-2.6.16-rc4/arch/um/kernel/process_kern.c	2006-02-18 14:39:49 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/um/kernel/process_kern.c	2006-02-17 23:26:32 +0100
@@ -23,6 +23,8 @@
 #include "linux/proc_fs.h"
 #include "linux/ptrace.h"
 #include "linux/random.h"
+#include "linux/vs_pid.h"
+
 #include "asm/unistd.h"
 #include "asm/mman.h"
 #include "asm/segment.h"
--- linux-2.6.16-rc4/arch/um/kernel/syscall_kern.c	2005-08-29 22:24:56 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/um/kernel/syscall_kern.c	2006-02-17 23:26:32 +0100
@@ -15,6 +15,8 @@
 #include "linux/unistd.h"
 #include "linux/slab.h"
 #include "linux/utime.h"
+#include <linux/vs_cvirt.h>
+
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "kern_util.h"
--- linux-2.6.16-rc4/arch/x86_64/ia32/ia32_aout.c	2006-01-03 17:29:20 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/x86_64/ia32/ia32_aout.c	2006-02-17 23:26:32 +0100
@@ -25,6 +25,7 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/arch/x86_64/ia32/ptrace32.c	2006-02-18 14:39:50 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/x86_64/ia32/ptrace32.c	2006-02-17 23:26:32 +0100
@@ -18,6 +18,7 @@
 #include <linux/unistd.h>
 #include <linux/mm.h>
 #include <linux/ptrace.h>
+#include <linux/vs_pid.h>
 #include <asm/ptrace.h>
 #include <asm/compat.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/arch/x86_64/ia32/syscall32.c	2005-10-28 20:49:18 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/x86_64/ia32/syscall32.c	2006-02-17 23:26:32 +0100
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/stringify.h>
 #include <linux/security.h>
+#include <linux/vs_memory.h>
 #include <asm/proto.h>
 #include <asm/tlbflush.h>
 #include <asm/ia32_unistd.h>
--- linux-2.6.16-rc4/arch/x86_64/kernel/sys_x86_64.c	2006-01-03 17:29:20 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/x86_64/kernel/sys_x86_64.c	2006-02-17 23:26:32 +0100
@@ -16,6 +16,7 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/personality.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ia32.h>
--- linux-2.6.16-rc4/drivers/char/sysrq.c	2006-02-18 14:39:54 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/drivers/char/sysrq.c	2006-02-17 23:26:32 +0100
@@ -36,6 +36,7 @@
 #include <linux/vt_kern.h>
 #include <linux/workqueue.h>
 #include <linux/kexec.h>
+#include <linux/vserver/debug.h>
 
 #include <asm/ptrace.h>
 
--- linux-2.6.16-rc4/drivers/char/tty_io.c	2006-02-18 14:39:54 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/drivers/char/tty_io.c	2006-02-18 15:33:51 +0100
@@ -103,6 +103,7 @@
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/vs_pid.h>
 
 #include <linux/kmod.h>
 
--- linux-2.6.16-rc4/drivers/infiniband/core/uverbs_mem.c	2005-10-28 20:49:23 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/drivers/infiniband/core/uverbs_mem.c	2006-02-17 23:26:32 +0100
@@ -36,6 +36,7 @@
 
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
+#include <linux/vs_memory.h>
 
 #include "uverbs.h"
 
--- linux-2.6.16-rc4/fs/attr.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/attr.c	2006-02-17 23:26:32 +0100
@@ -15,6 +15,9 @@
 #include <linux/fcntl.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
+#include <linux/vserver/debug.h>
 
 /* Taken over from the old code... */
 
--- linux-2.6.16-rc4/fs/binfmt_aout.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/binfmt_aout.c	2006-02-17 23:26:32 +0100
@@ -24,6 +24,7 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/fs/binfmt_elf.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/binfmt_elf.c	2006-02-17 23:26:32 +0100
@@ -38,6 +38,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/random.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/param.h>
--- linux-2.6.16-rc4/fs/binfmt_flat.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/binfmt_flat.c	2006-02-17 23:26:32 +0100
@@ -36,6 +36,7 @@
 #include <linux/personality.h>
 #include <linux/init.h>
 #include <linux/flat.h>
+#include <linux/vs_memory.h>
 
 #include <asm/byteorder.h>
 #include <asm/system.h>
--- linux-2.6.16-rc4/fs/binfmt_som.c	2006-01-03 17:29:55 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/binfmt_som.c	2006-02-17 23:26:32 +0100
@@ -28,6 +28,7 @@
 #include <linux/shm.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
--- linux-2.6.16-rc4/fs/dquot.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/dquot.c	2006-02-17 23:26:32 +0100
@@ -79,6 +79,7 @@
 #include <linux/buffer_head.h>
 #include <linux/capability.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/debug.h>
 
 #include <asm/uaccess.h>
 
--- linux-2.6.16-rc4/fs/exec.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/exec.c	2006-02-18 15:33:56 +0100
@@ -49,6 +49,7 @@
 #include <linux/rmap.h>
 #include <linux/acct.h>
 #include <linux/cn_proc.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
--- linux-2.6.16-rc4/fs/ext2/balloc.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext2/balloc.c	2006-02-17 23:26:32 +0100
@@ -17,6 +17,8 @@
 #include <linux/sched.h>
 #include <linux/buffer_head.h>
 #include <linux/capability.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- linux-2.6.16-rc4/fs/ext2/ialloc.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext2/ialloc.c	2006-02-17 23:26:32 +0100
@@ -18,6 +18,8 @@
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- linux-2.6.16-rc4/fs/ext2/inode.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext2/inode.c	2006-02-17 23:26:32 +0100
@@ -31,6 +31,7 @@
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>
 #include <linux/mpage.h>
+#include <linux/vserver/tag.h>
 #include "ext2.h"
 #include "acl.h"
 #include "xip.h"
--- linux-2.6.16-rc4/fs/ext2/namei.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext2/namei.c	2006-02-17 23:26:32 +0100
@@ -31,6 +31,7 @@
  */
 
 #include <linux/pagemap.h>
+#include <linux/vserver/tag.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- linux-2.6.16-rc4/fs/ext2/xattr.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext2/xattr.c	2006-02-18 15:37:06 +0100
@@ -60,6 +60,7 @@
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
 #include <linux/rwsem.h>
+#include <linux/vs_dlimit.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- linux-2.6.16-rc4/fs/ext3/balloc.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/balloc.c	2006-02-17 23:26:32 +0100
@@ -20,6 +20,8 @@
 #include <linux/ext3_jbd.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- linux-2.6.16-rc4/fs/ext3/ialloc.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/ialloc.c	2006-02-17 23:26:32 +0100
@@ -23,6 +23,8 @@
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/bitops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 #include <asm/byteorder.h>
 
--- linux-2.6.16-rc4/fs/ext3/inode.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/inode.c	2006-02-17 23:26:32 +0100
@@ -36,6 +36,7 @@
 #include <linux/writeback.h>
 #include <linux/mpage.h>
 #include <linux/uio.h>
+#include <linux/vserver/tag.h>
 #include "xattr.h"
 #include "acl.h"
 
--- linux-2.6.16-rc4/fs/ext3/ioctl.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/ioctl.c	2006-02-17 23:26:32 +0100
@@ -13,6 +14,7 @@ *****
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>
 #include <linux/time.h>
+#include <linux/vserver/tag.h>
 #include <asm/uaccess.h>
 
 
--- linux-2.6.16-rc4/fs/ext3/namei.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/namei.c	2006-02-17 23:26:32 +0100
@@ -36,6 +36,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/smp_lock.h>
+#include <linux/vserver/tag.h>
 
 #include "namei.h"
 #include "xattr.h"
--- linux-2.6.16-rc4/fs/ext3/xattr.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/xattr.c	2006-02-17 23:26:32 +0100
@@ -58,6 +58,7 @@
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
 #include <linux/rwsem.h>
+#include <linux/vs_dlimit.h>
 #include "xattr.h"
 #include "acl.h"
 
--- linux-2.6.16-rc4/fs/fcntl.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/fcntl.c	2006-02-17 23:26:32 +0100
@@ -18,6 +18,7 @@
 #include <linux/ptrace.h>
 #include <linux/signal.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_limit.h>
 
 #include <asm/poll.h>
 #include <asm/siginfo.h>
--- linux-2.6.16-rc4/fs/file_table.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/file_table.c	2006-02-17 23:26:32 +0100
@@ -19,6 +19,8 @@
 #include <linux/capability.h>
 #include <linux/cdev.h>
 #include <linux/fsnotify.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
 
 /* sysctl tunables... */
 struct files_stat_struct files_stat = {
--- linux-2.6.16-rc4/fs/ioctl.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ioctl.c	2006-02-17 23:26:32 +0100
@@ -13,6 +13,9 @@
 #include <linux/fs.h>
 #include <linux/security.h>
 #include <linux/module.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vserver/tag.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
--- linux-2.6.16-rc4/fs/ioprio.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ioprio.c	2006-02-17 23:26:32 +0100
@@ -24,6 +24,7 @@
 #include <linux/blkdev.h>
 #include <linux/capability.h>
 #include <linux/syscalls.h>
+#include <linux/vs_pid.h>
 
 static int set_task_ioprio(struct task_struct *task, int ioprio)
 {
--- linux-2.6.16-rc4/fs/jfs/inode.c	2005-10-28 20:49:44 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/inode.c	2006-02-17 23:26:32 +0100
@@ -22,6 +22,7 @@
 #include <linux/buffer_head.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_filsys.h"
--- linux-2.6.16-rc4/fs/jfs/jfs_dtree.c	2005-08-29 22:25:31 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/jfs_dtree.c	2006-02-17 23:26:32 +0100
@@ -102,6 +102,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_filsys.h"
--- linux-2.6.16-rc4/fs/jfs/jfs_extent.c	2005-08-29 22:25:32 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/jfs_extent.c	2006-02-17 23:26:32 +0100
@@ -18,6 +18,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_superblock.h"
--- linux-2.6.16-rc4/fs/jfs/jfs_imap.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/jfs_imap.c	2006-02-17 23:26:32 +0100
@@ -45,6 +45,7 @@
 #include <linux/buffer_head.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/tag.h>
 
 #include "jfs_incore.h"
 #include "jfs_inode.h"
--- linux-2.6.16-rc4/fs/jfs/jfs_inode.c	2005-08-29 22:25:32 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/jfs_inode.c	2006-02-17 23:26:32 +0100
@@ -18,6 +18,8 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_filsys.h"
--- linux-2.6.16-rc4/fs/jfs/jfs_xtree.c	2006-01-03 17:29:57 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/jfs_xtree.c	2006-02-17 23:26:32 +0100
@@ -21,6 +21,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
 #include "jfs_metapage.h"
--- linux-2.6.16-rc4/fs/jfs/namei.c	2006-01-03 17:29:57 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/namei.c	2006-02-17 23:26:32 +0100
@@ -20,6 +20,7 @@
 #include <linux/fs.h>
 #include <linux/ctype.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/tag.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_inode.h"
--- linux-2.6.16-rc4/fs/jfs/xattr.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/jfs/xattr.c	2006-02-17 23:26:32 +0100
@@ -23,6 +23,7 @@
 #include <linux/posix_acl_xattr.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_dmap.h"
--- linux-2.6.16-rc4/fs/locks.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/locks.c	2006-02-17 23:26:32 +0100
@@ -125,6 +125,7 @@
 #include <linux/syscalls.h>
 #include <linux/time.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_limit.h>
 
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/fs/namei.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/namei.c	2006-02-17 23:26:32 +0100
@@ -32,6 +32,10 @@
 #include <linux/file.h>
 #include <linux/fcntl.h>
 #include <linux/namei.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vs_tag.h>
+#include <linux/vserver/debug.h>
 #include <asm/namei.h>
 #include <asm/uaccess.h>
 
--- linux-2.6.16-rc4/fs/namespace.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/namespace.c	2006-02-17 23:28:12 +0100
@@ -23,6 +23,8 @@
 #include <linux/namei.h>
 #include <linux/security.h>
 #include <linux/mount.h>
+#include <linux/vserver/namespace.h>
+#include <linux/vserver/tag.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include "pnode.h"
--- linux-2.6.16-rc4/fs/nfs/dir.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfs/dir.c	2006-02-17 23:26:32 +0100
@@ -28,6 +28,7 @@
 #include <linux/sunrpc/clnt.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfs_mount.h>
+#include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
--- linux-2.6.16-rc4/fs/nfs/dir.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfs/dir.c	2006-02-17 23:26:32 +0100
@@ -31,6 +32,7 @@ *****
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
+#include <linux/vserver/tag.h>
 
 #include "nfs4_fs.h"
 #include "delegation.h"
--- linux-2.6.16-rc4/fs/nfs/inode.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfs/inode.c	2006-02-17 23:26:32 +0100
@@ -35,6 +35,7 @@
 #include <linux/mount.h>
 #include <linux/nfs_idmap.h>
 #include <linux/vfs.h>
+#include <linux/vserver/tag.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/fs/nfs/nfs3xdr.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfs/nfs3xdr.c	2006-02-17 23:26:32 +0100
@@ -22,6 +22,7 @@
 #include <linux/nfs3.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfsacl.h>
+#include <linux/vserver/tag.h>
 
 #define NFSDBG_FACILITY		NFSDBG_XDR
 
--- linux-2.6.16-rc4/fs/nfs/nfsroot.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfs/nfsroot.c	2006-02-17 23:26:32 +0100
@@ -87,6 +87,7 @@
 #include <linux/root_dev.h>
 #include <net/ipconfig.h>
 #include <linux/parser.h>
+#include <linux/vs_cvirt.h>
 
 /* Define this to allow debugging output */
 #undef NFSROOT_DEBUG
--- linux-2.6.16-rc4/fs/nfsd/auth.c	2004-08-14 12:56:14 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfsd/auth.c	2006-02-17 23:26:32 +0100
@@ -9,6 +9,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcauth.h>
 #include <linux/nfsd/nfsd.h>
+#include <linux/vserver/tag.h>
 
 #define	CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
 
--- linux-2.6.16-rc4/fs/nfsd/nfs3xdr.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfsd/nfs3xdr.c	2006-02-17 23:26:32 +0100
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/xdr3.h>
+#include <linux/vserver/tag.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- linux-2.6.16-rc4/fs/nfsd/nfs4xdr.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfsd/nfs4xdr.c	2006-02-17 23:26:32 +0100
@@ -57,6 +57,7 @@
 #include <linux/nfsd_idmap.h>
 #include <linux/nfs4.h>
 #include <linux/nfs4_acl.h>
+#include <linux/vserver/tag.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- linux-2.6.16-rc4/fs/nfsd/nfsxdr.c	2006-02-18 14:40:23 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/nfsd/nfsxdr.c	2006-02-17 23:26:32 +0100
@@ -15,6 +15,7 @@
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/xdr.h>
 #include <linux/mm.h>
+#include <linux/vserver/tag.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- linux-2.6.16-rc4/fs/open.c	2006-02-18 14:40:24 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/open.c	2006-02-17 23:26:32 +0100
@@ -27,6 +27,9 @@
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/tag.h>
 
 #include <asm/unistd.h>
 
--- linux-2.6.16-rc4/fs/proc/array.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/proc/array.c	2006-02-17 23:26:32 +0100
@@ -75,6 +75,9 @@
 #include <linux/times.h>
 #include <linux/cpuset.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
--- linux-2.6.16-rc4/fs/proc/base.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/proc/base.c	2006-02-17 23:26:32 +0100
@@ -72,6 +72,8 @@
 #include <linux/cpuset.h>
 #include <linux/audit.h>
 #include <linux/poll.h>
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
 #include "internal.h"
 
 /*
--- linux-2.6.16-rc4/fs/proc/generic.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/proc/generic.c	2006-02-17 23:26:32 +0100
@@ -19,6 +19,7 @@
 #include <linux/idr.h>
 #include <linux/namei.h>
 #include <linux/bitops.h>
+#include <linux/vserver/inode.h>
 #include <asm/uaccess.h>
 
 #include "internal.h"
--- linux-2.6.16-rc4/fs/proc/proc_misc.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/proc/proc_misc.c	2006-02-17 23:26:32 +0100
@@ -53,6 +53,8 @@
 #include <asm/div64.h>
 #include "internal.h"
 
+#include <linux/vs_cvirt.h>
+
 #define LOAD_INT(x) ((x) >> FSHIFT)
 #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
 /*
--- linux-2.6.16-rc4/fs/reiserfs/bitmap.c	2005-08-29 22:25:33 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/reiserfs/bitmap.c	2006-02-17 23:26:32 +0100
@@ -13,6 +13,7 @@
 #include <linux/reiserfs_fs_sb.h>
 #include <linux/reiserfs_fs_i.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 
 #define PREALLOCATION_SIZE 9
 
--- linux-2.6.16-rc4/fs/reiserfs/inode.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/reiserfs/inode.c	2006-02-17 23:26:32 +0100
@@ -17,6 +17,8 @@
 #include <linux/mpage.h>
 #include <linux/writeback.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/tag.h>
 
 extern int reiserfs_default_io_size;	/* default io size devuned in super.c */
 
--- linux-2.6.16-rc4/fs/reiserfs/namei.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/reiserfs/namei.c	2006-02-17 23:26:32 +0100
@@ -19,6 +19,7 @@
 #include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 #include <linux/quotaops.h>
+#include <linux/vs_tag.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--;
--- linux-2.6.16-rc4/fs/reiserfs/stree.c	2005-08-29 22:25:33 +0200
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/reiserfs/stree.c	2006-02-17 23:26:32 +0100
@@ -57,6 +57,7 @@
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 
 /* Does the buffer contain a disk block which is in the tree. */
 inline int B_IS_IN_TREE(const struct buffer_head *p_s_bh)
--- linux-2.6.16-rc4/fs/super.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/super.c	2006-02-17 23:26:32 +0100
@@ -37,6 +37,8 @@
 #include <linux/writeback.h>		/* for the emergency remount stuff */
 #include <linux/idr.h>
 #include <linux/kobject.h>
+#include <linux/devpts_fs.h>
+#include <linux/proc_fs.h>
 #include <asm/uaccess.h>
 
 
--- linux-2.6.16-rc4/fs/xfs/linux-2.6/xfs_iops.c	2006-02-18 14:40:27 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/xfs/linux-2.6/xfs_iops.c	2006-02-17 23:26:32 +0100
@@ -55,6 +55,7 @@
 #include <linux/xattr.h>
 #include <linux/namei.h>
 #include <linux/security.h>
+#include <linux/vserver/tag.h>
 
 /*
  * Get a XFS inode from a given vnode.
--- linux-2.6.16-rc4/fs/xfs/xfs_inode.c	2006-02-18 14:40:27 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/xfs/xfs_inode.c	2006-02-17 23:26:32 +0100
@@ -52,6 +52,7 @@
 #include "xfs_mac.h"
 #include "xfs_acl.h"
 
+#include <linux/vs_tag.h>
 
 kmem_zone_t *xfs_ifork_zone;
 kmem_zone_t *xfs_inode_zone;
--- linux-2.6.16-rc4/include/asm-arm/tlb.h	2006-01-03 17:30:02 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/asm-arm/tlb.h	2006-02-17 23:26:32 +0100
@@ -20,6 +20,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/pgalloc.h>
+#include <linux/vs_memory.h>
 
 /*
  * TLB handling.  This allows us to remove pages from the page
--- linux-2.6.16-rc4/include/asm-arm26/tlb.h	2006-01-03 17:30:02 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/asm-arm26/tlb.h	2006-02-17 23:26:32 +0100
@@ -3,6 +3,7 @@
 
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
+#include <linux/vs_memory.h>
 
 /*
  * TLB handling.  This allows us to remove pages from the page
--- linux-2.6.16-rc4/include/asm-generic/tlb.h	2006-01-03 17:30:02 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/asm-generic/tlb.h	2006-02-17 23:26:32 +0100
@@ -15,6 +15,7 @@
 
 #include <linux/config.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
--- linux-2.6.16-rc4/include/asm-ia64/tlb.h	2006-01-03 17:30:05 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/asm-ia64/tlb.h	2006-02-17 23:26:32 +0100
@@ -41,6 +41,7 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgalloc.h>
 #include <asm/processor.h>
--- linux-2.6.16-rc4/include/asm-sparc64/tlb.h	2006-01-03 17:30:08 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/asm-sparc64/tlb.h	2006-02-17 23:26:32 +0100
@@ -3,6 +3,7 @@
 
 #include <linux/config.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
--- linux-2.6.16-rc4/include/linux/sched.h	2006-02-18 14:40:35 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/linux/sched.h	2006-02-18 15:33:57 +0100
@@ -15,6 +15,7 @@
 #include <linux/cpumask.h>
 #include <linux/errno.h>
 #include <linux/nodemask.h>
+#include <linux/vs_base.h>
 
 #include <asm/system.h>
 #include <asm/semaphore.h>
--- linux-2.6.16-rc4/include/net/route.h	2006-02-18 14:40:36 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/net/route.h	2006-02-17 23:26:33 +0100
@@ -28,6 +28,7 @@
 #include <net/dst.h>
 #include <net/inetpeer.h>
 #include <net/flow.h>
+#include <net/inet_sock.h>
 #include <linux/in_route.h>
 #include <linux/rtnetlink.h>
 #include <linux/route.h>
--- linux-2.6.16-rc4/include/net/route.h	2006-02-18 14:40:36 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/include/net/route.h	2006-02-17 23:26:33 +0100
@@ -33,6 +34,8 @@ *****
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
+#include <linux/vs_network.h>
+#include <linux/in.h>
 
 #ifndef __KERNEL__
 #warning This file is not supposed to be used outside of kernel.
--- linux-2.6.16-rc4/ipc/mqueue.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/ipc/mqueue.c	2006-02-17 23:26:33 +0100
@@ -25,6 +25,8 @@
 #include <linux/netlink.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 #include <net/sock.h>
 #include "util.h"
 
--- linux-2.6.16-rc4/ipc/shm.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/ipc/shm.c	2006-02-17 23:26:33 +0100
@@ -30,6 +30,8 @@
 #include <linux/capability.h>
 #include <linux/ptrace.h>
 #include <linux/seq_file.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 
 #include <asm/uaccess.h>
 
--- linux-2.6.16-rc4/kernel/capability.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/capability.c	2006-02-17 23:26:33 +0100
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_pid.h>
 #include <asm/uaccess.h>
 
 unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
--- linux-2.6.16-rc4/kernel/cpuset.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/cpuset.c	2006-02-18 15:33:57 +0100
@@ -50,6 +50,7 @@
 #include <linux/time.h>
 #include <linux/backing-dev.h>
 #include <linux/sort.h>
+#include <linux/vs_pid.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
--- linux-2.6.16-rc4/kernel/exit.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/exit.c	2006-02-20 23:19:58 +0100
@@ -31,6 +31,10 @@
 #include <linux/signal.h>
 #include <linux/cn_proc.h>
 #include <linux/mutex.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- linux-2.6.16-rc4/kernel/fork.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/fork.c	2006-02-18 15:37:58 +0100
@@ -44,6 +44,10 @@
 #include <linux/rmap.h>
 #include <linux/acct.h>
 #include <linux/cn_proc.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
--- linux-2.6.16-rc4/kernel/posix-cpu-timers.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/posix-cpu-timers.c	2006-02-17 23:26:33 +0100
@@ -6,6 +6,7 @@
 #include <linux/posix-timers.h>
 #include <asm/uaccess.h>
 #include <linux/errno.h>
+#include <linux/vs_pid.h>
 
 static int check_clock(const clockid_t which_clock)
 {
--- linux-2.6.16-rc4/kernel/posix-timers.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/posix-timers.c	2006-02-17 23:26:33 +0100
@@ -47,6 +47,8 @@
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 #include <linux/module.h>
+#include <linux/vs_context.h>
+#include <linux/vs_pid.h>
 
 /*
  * Management arrays for POSIX timers.	 Timers are kept in slab memory
--- linux-2.6.16-rc4/kernel/printk.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/printk.c	2006-02-17 23:26:33 +0100
@@ -31,6 +31,8 @@
 #include <linux/security.h>
 #include <linux/bootmem.h>
 #include <linux/syscalls.h>
+#include <linux/vs_context.h>
+#include <linux/vserver/cvirt.h>
 
 #include <asm/uaccess.h>
 
--- linux-2.6.16-rc4/kernel/sched.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/sched.c	2006-02-18 15:33:58 +0100
@@ -52,6 +52,10 @@
 #include <asm/tlb.h>
 
 #include <asm/unistd.h>
+#include <linux/vs_context.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
+#include <linux/vs_sched.h>
 
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
--- linux-2.6.16-rc4/kernel/softirq.c	2006-01-03 17:30:12 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/softirq.c	2006-02-17 23:26:33 +0100
@@ -16,6 +16,7 @@
 #include <linux/cpu.h>
 #include <linux/kthread.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_context.h>
 
 #include <asm/irq.h>
 /*
--- linux-2.6.16-rc4/kernel/sys.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/sys.c	2006-02-17 23:26:33 +0100
@@ -11,6 +11,7 @@
 #include <linux/mman.h>
 #include <linux/smp_lock.h>
 #include <linux/notifier.h>
+#include <linux/kmod.h>
 #include <linux/reboot.h>
 #include <linux/prctl.h>
 #include <linux/init.h>
--- linux-2.6.16-rc4/kernel/sys.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/sys.c	2006-02-17 23:26:33 +0100
@@ -30,6 +31,8 @@
 #include <linux/tty.h>
 #include <linux/signal.h>
 #include <linux/cn_proc.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
--- linux-2.6.16-rc4/kernel/sysctl.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/sysctl.c	2006-02-18 15:33:58 +0100
@@ -44,6 +44,7 @@
 #include <linux/limits.h>
 #include <linux/dcache.h>
 #include <linux/syscalls.h>
+#include <linux/vserver/cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
--- linux-2.6.16-rc4/kernel/timer.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/timer.c	2006-02-18 15:33:58 +0100
@@ -34,6 +34,9 @@
 #include <linux/cpu.h>
 #include <linux/syscalls.h>
 #include <linux/delay.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
+#include <linux/vserver/sched.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- linux-2.6.16-rc4/mm/filemap_xip.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/filemap_xip.c	2006-02-17 23:26:33 +0100
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/rmap.h>
+#include <linux/vs_memory.h>
 #include <asm/tlbflush.h>
 #include "filemap.h"
 
--- linux-2.6.16-rc4/mm/fremap.c	2006-01-03 17:30:13 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/fremap.c	2006-02-17 23:26:33 +0100
@@ -15,6 +15,7 @@
 #include <linux/rmap.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
--- linux-2.6.16-rc4/mm/hugetlb.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/hugetlb.c	2006-02-18 15:33:58 +0100
@@ -18,6 +18,7 @@
 #include <asm/pgtable.h>
 
 #include <linux/hugetlb.h>
+#include <linux/vs_memory.h>
 
 const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
 static unsigned long nr_huge_pages, free_huge_pages;
--- linux-2.6.16-rc4/mm/mlock.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/mlock.c	2006-02-17 23:26:33 +0100
@@ -10,6 +10,7 @@
 #include <linux/mm.h>
 #include <linux/mempolicy.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 
 static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
--- linux-2.6.16-rc4/mm/mremap.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/mremap.c	2006-02-17 23:26:33 +0100
@@ -18,6 +18,7 @@
 #include <linux/highmem.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
--- linux-2.6.16-rc4/mm/page_alloc.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/page_alloc.c	2006-02-18 15:33:58 +0100
@@ -37,6 +37,7 @@
 #include <linux/nodemask.h>
 #include <linux/vmalloc.h>
 #include <linux/mempolicy.h>
+#include <linux/vs_limit.h>
 
 #include <asm/tlbflush.h>
 #include "internal.h"
--- linux-2.6.16-rc4/mm/rmap.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/rmap.c	2006-02-17 23:26:33 +0100
@@ -53,6 +53,7 @@
 #include <linux/rmap.h>
 #include <linux/rcupdate.h>
 #include <linux/module.h>
+#include <linux/vs_memory.h>
 
 #include <asm/tlbflush.h>
 
--- linux-2.6.16-rc4/mm/swapfile.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/mm/swapfile.c	2006-02-17 23:26:33 +0100
@@ -32,6 +32,7 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <linux/swapops.h>
+#include <linux/vs_memory.h>
 
 DEFINE_SPINLOCK(swap_lock);
 unsigned int nr_swapfiles;
--- linux-2.6.16-rc4/net/core/dev.c	2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/core/dev.c	2006-02-17 23:26:33 +0100
@@ -114,6 +114,7 @@
 #include <linux/wireless.h>		/* Note : will define WIRELESS_EXT */
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
+#include <linux/vs_network.h>
 #include <asm/current.h>
 
 /*
--- linux-2.6.16-rc4/net/core/sock.c	2006-02-18 14:40:39 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/core/sock.c	2006-02-17 23:26:33 +0100
@@ -125,6 +125,9 @@
 #include <linux/ipsec.h>
 
 #include <linux/filter.h>
+#include <linux/vs_socket.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
 
 #ifdef CONFIG_INET
 #include <net/tcp.h>
--- linux-2.6.16-rc4/net/ipv4/af_inet.c	2006-02-18 14:40:39 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/ipv4/af_inet.c	2006-02-17 23:26:33 +0100
@@ -114,6 +114,7 @@
 #ifdef CONFIG_IP_MROUTE
 #include <linux/mroute.h>
 #endif
+#include <linux/vs_limit.h>
 
 DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
 
--- linux-2.6.16-rc4/net/ipv4/tcp.c	2006-02-18 14:40:42 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/ipv4/tcp.c	2006-02-17 23:26:33 +0100
@@ -257,6 +257,7 @@
 #include <linux/fs.h>
 #include <linux/random.h>
 #include <linux/bootmem.h>
+#include <linux/in.h>
 
 #include <net/icmp.h>
 #include <net/tcp.h>
--- linux-2.6.16-rc4/net/ipv4/tcp_ipv4.c	2006-02-18 14:40:42 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/ipv4/tcp_ipv4.c	2006-02-17 23:26:33 +0100
@@ -77,6 +77,7 @@
 #include <linux/stddef.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/vserver/debug.h>
 
 int sysctl_tcp_tw_reuse;
 int sysctl_tcp_low_latency;
--- linux-2.6.16-rc4/net/ipv4/tcp_minisocks.c	2006-02-18 14:40:42 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/ipv4/tcp_minisocks.c	2006-02-17 23:26:33 +0100
@@ -29,6 +29,10 @@
 #include <net/inet_common.h>
 #include <net/xfrm.h>
 
+#include <linux/vs_limit.h>
+#include <linux/vs_socket.h>
+#include <linux/vs_context.h>
+
 #ifdef CONFIG_SYSCTL
 #define SYNC_INIT 0 /* let the user enable it */
 #else
--- linux-2.6.16-rc4/net/netlink/af_netlink.c	2006-02-18 14:40:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/netlink/af_netlink.c	2006-02-17 23:26:33 +0100
@@ -56,6 +56,9 @@
 #include <linux/mm.h>
 #include <linux/types.h>
 #include <linux/audit.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
 
 #include <net/sock.h>
 #include <net/scm.h>
--- linux-2.6.16-rc4/net/socket.c	2006-02-18 14:40:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/socket.c	2006-02-17 23:26:33 +0100
@@ -96,6 +96,7 @@
 
 #include <net/sock.h>
 #include <linux/netfilter.h>
+#include <linux/vs_socket.h>
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
--- linux-2.6.16-rc4/net/sunrpc/auth.c	2006-02-18 14:40:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/sunrpc/auth.c	2006-02-17 23:26:33 +0100
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/spinlock.h>
+#include <linux/vs_tag.h>
 
 #ifdef RPC_DEBUG
 # define RPCDBG_FACILITY	RPCDBG_AUTH
--- linux-2.6.16-rc4/net/sunrpc/auth_unix.c	2006-02-18 14:40:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/sunrpc/auth_unix.c	2006-02-17 23:26:33 +0100
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/auth.h>
+#include <linux/vs_tag.h>
 
 #define NFS_NGROUPS	16
 
--- linux-2.6.16-rc4/net/unix/af_unix.c	2006-02-18 14:40:43 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/net/unix/af_unix.c	2006-02-17 23:26:33 +0100
@@ -117,6 +117,9 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
 
 int sysctl_unix_max_dgram_qlen = 10;
 
--- linux-2.6.16-rc4/ipc/sem.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/ipc/sem.c	2006-02-17 23:26:33 +0100
@@ -75,6 +75,7 @@
 #include <linux/audit.h>
 #include <linux/capability.h>
 #include <linux/seq_file.h>
+#include <linux/vs_limit.h>
 #include <asm/uaccess.h>
 #include "util.h"
 
--- linux-2.6.16-rc4/arch/mips/kernel/linux32.c	2006-02-18 14:39:45 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/mips/kernel/linux32.c	2006-02-17 23:26:32 +0100
@@ -37,6 +37,7 @@
 #include <linux/security.h>
 #include <linux/compat.h>
 #include <linux/vfs.h>
+#include <linux/vs_cvirt.h>
 
 #include <net/sock.h>
 #include <net/scm.h>
---- linux-2.6.16-rc4/arch/x86_64/ia32/sys_ia32.c	2006-02-18 14:39:50 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/arch/x86_64/ia32/sys_ia32.c	2006-02-17 23:26:32 +0100
@@ -62,6 +62,7 @@
 #include <linux/highuid.h>
 #include <linux/vmalloc.h>
 #include <linux/fsnotify.h>
+#include <linux/vs_cvirt.h>
 #include <asm/mman.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/fs/ext2/ioctl.c	2006-02-18 14:40:21 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext2/ioctl.c	2006-02-17 23:26:32 +0100
@@ -11,6 +11,7 @@
 #include <linux/capability.h>
 #include <linux/time.h>
 #include <linux/sched.h>
+#include <linux/mount.h>
 #include <asm/current.h>
 #include <asm/uaccess.h>
 
--- linux-2.6.16-rc4/fs/ext3/ioctl.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/ext3/ioctl.c	2006-02-17 23:26:32 +0100
@@ -8,6 +8,7 @@
  */
 
 #include <linux/fs.h>
+#include <linux/mount.h>
 #include <linux/jbd.h>
 #include <linux/capability.h>
 #include <linux/ext3_fs.h>
--- linux-2.6.16-rc4/fs/hfsplus/ioctl.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/hfsplus/ioctl.c	2006-02-17 23:26:32 +0100
@@ -16,6 +16,7 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/xattr.h>
+#include <linux/mount.h>
 #include <asm/uaccess.h>
 #include "hfsplus_fs.h"
 
--- linux-2.6.16-rc4/fs/reiserfs/ioctl.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/reiserfs/ioctl.c	2006-02-17 23:26:32 +0100
@@ -4,6 +4,7 @@
 
 #include <linux/capability.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/time.h>
 #include <asm/uaccess.h>
--- linux-2.6.16-rc4/fs/reiserfs/xattr.c	2006-02-18 14:40:26 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/reiserfs/xattr.c	2006-02-17 23:26:32 +0100
@@ -35,6 +35,7 @@
 #include <linux/namei.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
 #include <linux/file.h>
 #include <linux/pagemap.h>
 #include <linux/xattr.h>
--- linux-2.6.16-rc4/fs/xattr.c	2006-02-18 14:40:27 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/xattr.c	2006-02-17 23:26:32 +0100
@@ -17,6 +17,7 @@
 #include <linux/syscalls.h>
 #include <linux/module.h>
 #include <linux/fsnotify.h>
+#include <linux/mount.h>
 #include <asm/uaccess.h>