diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/alpha/kernel/ptrace.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/alpha/kernel/ptrace.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/alpha/kernel/ptrace.c	2006-02-14 11:41:40 +0100
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/alpha/kernel/ptrace.c	2006-05-29 16:14:04 +0200
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/security.h>
 #include <linux/signal.h>
-#include <linux/vs_pid.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/frv/mm/mmu-context.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/frv/mm/mmu-context.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/frv/mm/mmu-context.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/frv/mm/mmu-context.c	2006-05-29 16:14:10 +0200
@@ -11,7 +11,6 @@
 
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/vs_pid.h>
 #include <asm/tlbflush.h>
 
 #define NR_CXN	4096
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/ia32/sys_ia32.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/ia32/sys_ia32.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/ia32/sys_ia32.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/ia32/sys_ia32.c	2006-05-29 16:14:28 +0200
@@ -51,7 +51,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/kernel/perfmon.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/kernel/perfmon.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/kernel/perfmon.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/kernel/perfmon.c	2006-05-29 16:14:42 +0200
@@ -42,7 +42,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/kernel/ptrace.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/kernel/ptrace.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/kernel/ptrace.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/kernel/ptrace.c	2006-05-29 16:14:49 +0200
@@ -18,7 +18,6 @@
 #include <linux/security.h>
 #include <linux/audit.h>
 #include <linux/signal.h>
-#include <linux/vs_pid.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/kernel/signal.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/kernel/signal.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/ia64/kernel/signal.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/ia64/kernel/signal.c	2006-05-29 16:14:55 +0200
@@ -21,7 +21,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/mips/kernel/sysirix.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/mips/kernel/sysirix.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/mips/kernel/sysirix.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/mips/kernel/sysirix.c	2006-05-29 16:15:05 +0200
@@ -31,7 +31,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/sparc/kernel/ptrace.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/sparc/kernel/ptrace.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/sparc/kernel/ptrace.c	2006-02-14 11:41:40 +0100
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/sparc/kernel/ptrace.c	2006-05-29 16:15:11 +0200
@@ -19,7 +19,6 @@
 #include <linux/smp_lock.h>
 #include <linux/security.h>
 #include <linux/signal.h>
-#include <linux/vs_pid.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/sparc64/kernel/ptrace.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/sparc64/kernel/ptrace.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/sparc64/kernel/ptrace.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/sparc64/kernel/ptrace.c	2006-05-29 16:15:16 +0200
@@ -22,7 +22,6 @@
 #include <linux/seccomp.h>
 #include <linux/audit.h>
 #include <linux/signal.h>
-#include <linux/vs_pid.h>
 
 #include <asm/asi.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/um/kernel/process_kern.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/um/kernel/process_kern.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/um/kernel/process_kern.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/um/kernel/process_kern.c	2006-05-29 16:15:46 +0200
@@ -23,7 +23,6 @@
 #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"
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/arch/x86_64/ia32/ptrace32.c linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/x86_64/ia32/ptrace32.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/arch/x86_64/ia32/ptrace32.c	2006-02-14 11:41:40 +0100
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/arch/x86_64/ia32/ptrace32.c	2006-05-29 16:15:57 +0200
@@ -18,7 +18,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/drivers/char/tty_io.c linux-2.6.17-rc1-vs2.1.1-rc16.1/drivers/char/tty_io.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/drivers/char/tty_io.c	2006-04-09 13:57:39 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/drivers/char/tty_io.c	2006-05-29 16:16:11 +0200
@@ -103,7 +103,6 @@
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/devfs_fs_kernel.h>
-#include <linux/vs_pid.h>
 
 #include <linux/kmod.h>
 
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/fs/ioprio.c linux-2.6.17-rc1-vs2.1.1-rc16.1/fs/ioprio.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/fs/ioprio.c	2006-03-23 19:35:26 +0100
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/fs/ioprio.c	2006-05-29 16:16:29 +0200
@@ -24,7 +24,6 @@
 #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)
 {
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/fs/proc/array.c linux-2.6.17-rc1-vs2.1.1-rc16.1/fs/proc/array.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/fs/proc/array.c	2006-04-14 04:33:53 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/fs/proc/array.c	2006-05-29 16:16:39 +0200
@@ -77,7 +77,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/fs/proc/base.c linux-2.6.17-rc1-vs2.1.1-rc16.1/fs/proc/base.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/fs/proc/base.c	2006-04-09 15:16:19 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/fs/proc/base.c	2006-05-29 16:16:48 +0200
@@ -73,7 +73,6 @@
 #include <linux/audit.h>
 #include <linux/poll.h>
 #include <linux/vs_network.h>
-#include <linux/vs_pid.h>
 #include "internal.h"
 
 /*
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/include/linux/sched.h linux-2.6.17-rc1-vs2.1.1-rc16.1/include/linux/sched.h
--- linux-2.6.17-rc1-vs2.1.1-rc16/include/linux/sched.h	2006-04-09 13:57:48 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/include/linux/sched.h	2006-05-29 15:53:09 +0200
@@ -37,6 +37,7 @@
 #include <linux/seccomp.h>
 #include <linux/rcupdate.h>
 #include <linux/futex.h>
+#include <linux/vs_pid.h>
 
 #include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
 
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/capability.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/capability.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/capability.c	2006-04-14 04:33:53 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/capability.c	2006-05-29 16:17:00 +0200
@@ -12,7 +12,6 @@
 #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 */
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/cpuset.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/cpuset.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/cpuset.c	2006-04-09 13:57:48 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/cpuset.c	2006-05-29 16:17:07 +0200
@@ -49,7 +49,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/exit.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/exit.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/exit.c	2006-04-14 04:33:53 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/exit.c	2006-05-29 16:17:17 +0200
@@ -37,7 +37,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/futex.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/futex.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/futex.c	2006-04-09 15:05:05 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/futex.c	2006-05-29 16:17:42 +0200
@@ -44,7 +44,6 @@
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
-#include <linux/vs_pid.h>
 #include <asm/futex.h>
 
 #define FUTEX_HASHBITS (CONFIG_BASE_SMALL ? 4 : 8)
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/futex_compat.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/futex_compat.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/futex_compat.c	2006-04-14 06:47:12 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/futex_compat.c	2006-05-29 16:17:56 +0200
@@ -9,7 +9,6 @@
 #include <linux/linkage.h>
 #include <linux/compat.h>
 #include <linux/futex.h>
-#include <linux/vs_pid.h>
 
 #include <asm/uaccess.h>
 
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/posix-cpu-timers.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/posix-cpu-timers.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/posix-cpu-timers.c	2006-03-20 18:09:05 +0100
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/posix-cpu-timers.c	2006-05-29 16:18:03 +0200
@@ -6,7 +6,6 @@
 #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)
 {
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/posix-timers.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/posix-timers.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/posix-timers.c	2006-04-09 13:57:48 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/posix-timers.c	2006-05-29 16:18:17 +0200
@@ -49,7 +49,6 @@
 #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
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/ptrace.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/ptrace.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/ptrace.c	2006-04-09 13:57:48 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/ptrace.c	2006-05-29 16:18:22 +0200
@@ -18,7 +18,6 @@
 #include <linux/ptrace.h>
 #include <linux/security.h>
 #include <linux/signal.h>
-#include <linux/vs_pid.h>
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/sched.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/sched.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/sched.c	2006-04-14 05:06:49 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/sched.c	2006-05-29 16:18:32 +0200
@@ -55,7 +55,6 @@
 #include <asm/unistd.h>
 #include <linux/vs_context.h>
 #include <linux/vs_cvirt.h>
-#include <linux/vs_pid.h>
 #include <linux/vs_sched.h>
 
 /*
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/signal.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/signal.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/signal.c	2006-04-09 13:57:48 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/signal.c	2006-05-29 16:18:40 +0200
@@ -25,7 +25,6 @@
 #include <linux/signal.h>
 #include <linux/audit.h>
 #include <linux/capability.h>
-#include <linux/vs_pid.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/sys.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/sys.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/sys.c	2006-04-14 04:33:53 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/sys.c	2006-05-29 16:18:47 +0200
@@ -32,7 +32,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/kernel/timer.c linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/timer.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/kernel/timer.c	2006-04-09 13:57:48 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/kernel/timer.c	2006-05-29 16:18:53 +0200
@@ -35,7 +35,6 @@
 #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>
diff -NurpP --minimal linux-2.6.17-rc1-vs2.1.1-rc16/mm/mempolicy.c linux-2.6.17-rc1-vs2.1.1-rc16.1/mm/mempolicy.c
--- linux-2.6.17-rc1-vs2.1.1-rc16/mm/mempolicy.c	2006-04-09 14:54:50 +0200
+++ linux-2.6.17-rc1-vs2.1.1-rc16.1/mm/mempolicy.c	2006-05-29 16:19:09 +0200
@@ -87,7 +87,6 @@
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
 #include <linux/migrate.h>
-#include <linux/vs_pid.h>
 
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>