diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/include/linux/vs_dlimit.h linux-2.6.22.2-vs2.3.0.17.4/include/linux/vs_dlimit.h
--- linux-2.6.22.2-vs2.3.0.17.3/include/linux/vs_dlimit.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/include/linux/vs_dlimit.h	2007-08-15 22:04:43 +0200
@@ -1,6 +1,8 @@
 #ifndef _VS_DLIMIT_H
 #define _VS_DLIMIT_H
 
+#include <linux/fs.h>
+
 #include "vserver/dlimit.h"
 #include "vserver/base.h"
 #include "vserver/debug.h"
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/dlimit.h linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/dlimit.h
--- linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/dlimit.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/dlimit.h	2007-08-15 22:03:58 +0200
@@ -11,6 +11,7 @@
 #define DLIM_INFINITY		(~0ULL)
 
 #include <linux/spinlock.h>
+#include <linux/rcupdate.h>
 
 struct super_block;
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/limit.h linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/limit.h
--- linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/limit.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/limit.h	2007-08-15 22:27:29 +0200
@@ -20,6 +19,9 @@
 
 #define	VLIM_INFINITY	(~0ULL)
 
+#include <asm/atomic.h>
+#include <asm/resource.h>
+
 #ifndef RLIM_INFINITY
 #warning RLIM_INFINITY is undefined
 #endif
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/monitor.h linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/monitor.h
--- linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/monitor.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/monitor.h	2007-08-15 23:16:12 +0200
@@ -1,6 +1,7 @@
 #ifndef _VX_MONITOR_H
 #define _VX_MONITOR_H
 
+#include <linux/types.h>
 
 enum {
 	VXM_UNUSED = 0,
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/tag.h linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/tag.h
--- linux-2.6.22.2-vs2.3.0.17.3/include/linux/vserver/tag.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/include/linux/vserver/tag.h	2007-08-15 22:06:46 +0200
@@ -1,6 +1,8 @@
 #ifndef _DX_TAG_H
 #define _DX_TAG_H
 
+#include <linux/types.h>
+
 
 #define DX_TAG(in)	(IS_TAGGED(in))
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/cacct.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/cacct.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/cacct.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/cacct.c	2007-08-15 21:54:31 +0200
@@ -10,9 +10,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/sched.h>
 #include <linux/vs_context.h>
-#include <linux/vserver/switch.h>
 #include <linux/vserver/cacct_cmd.h>
 #include <linux/vserver/cacct_int.h>
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/context.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/context.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/context.c	2007-08-15 21:26:55 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/context.c	2007-08-15 21:57:56 +0200
@@ -27,10 +27,8 @@
 
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/mnt_namespace.h>
 #include <linux/pid_namespace.h>
 
-#include <linux/sched.h>
 #include <linux/vserver/context.h>
 #include <linux/vserver/network.h>
 #include <linux/vserver/debug.h>
@@ -42,9 +40,6 @@
 #include <linux/vs_limit.h>
 #include <linux/vserver/context_cmd.h>
 
-#include <linux/err.h>
-#include <asm/errno.h>
-
 #include "cvirt_init.h"
 #include "cacct_init.h"
 #include "limit_init.h"
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/cvirt.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/cvirt.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/cvirt.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/cvirt.c	2007-08-15 22:00:34 +0200
@@ -11,15 +11,11 @@
  *
  */
 
-#include <linux/sched.h>
-#include <linux/sysctl.h>
 #include <linux/types.h>
-#include <linux/vs_context.h>
 #include <linux/vs_cvirt.h>
 #include <linux/vserver/switch.h>
 #include <linux/vserver/cvirt_cmd.h>
 
-#include <asm/errno.h>
 #include <asm/uaccess.h>
 
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/debug.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/debug.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/debug.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/debug.c	2007-08-15 22:01:52 +0200
@@ -7,10 +7,7 @@
  *
  */
 
-#include <linux/errno.h>
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/vs_base.h>
 
 #include <linux/vserver/context.h>
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/dlimit.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/dlimit.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/dlimit.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/dlimit.c	2007-08-15 22:07:58 +0200
@@ -10,17 +10,11 @@
  *
  */
 
-#include <linux/fs.h>
-#include <linux/namei.h>
 #include <linux/statfs.h>
-#include <linux/compat.h>
-#include <linux/vserver/switch.h>
-#include <linux/vs_context.h>
 #include <linux/vs_tag.h>
 #include <linux/vs_dlimit.h>
 #include <linux/vserver/dlimit_cmd.h>
 
-#include <asm/errno.h>
 #include <asm/uaccess.h>
 
 /*	__alloc_dl_info()
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/helper.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/helper.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/helper.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/helper.c	2007-08-15 22:12:01 +0200
@@ -9,17 +9,12 @@
  *
  */
 
-#include <linux/errno.h>
 #include <linux/kmod.h>
-#include <linux/sched.h>
 #include <linux/reboot.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vserver/signal.h>
 
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
-
 
 char vshelper_path[255] = "/sbin/vshelper";
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/history.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/history.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/history.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/history.c	2007-08-15 22:13:54 +0200
@@ -11,14 +11,8 @@
  *
  */
 
-#include <linux/errno.h>
 #include <linux/module.h>
-#include <linux/types.h>
-#include <linux/ctype.h>
-
 #include <asm/uaccess.h>
-#include <asm/atomic.h>
-#include <asm/unistd.h>
 
 #include <linux/vserver/context.h>
 #include <linux/vserver/debug.h>
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/inet.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/inet.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/inet.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/inet.c	2007-08-15 22:14:43 +0200
@@ -1,5 +1,4 @@
 
-#include <linux/sched.h>
 #include <linux/vserver/debug.h>
 #include <linux/vs_inet.h>
 #include <linux/vs_inet6.h>
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/init.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/init.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/init.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/init.c	2007-08-15 22:15:36 +0200
@@ -9,9 +9,7 @@
  *
  */
 
-#include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/module.h>
 
 int	vserver_register_sysctl(void);
 void	vserver_unregister_sysctl(void);
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/inode.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/inode.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/inode.c	2007-08-14 23:17:51 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/inode.c	2007-08-15 22:22:30 +0200
@@ -10,20 +10,16 @@
  *
  */
 
-#include <linux/sched.h>
+#include <linux/tty.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/fs.h>
 #include <linux/file.h>
-#include <linux/compat.h>
 #include <linux/vserver/inode.h>
 #include <linux/vserver/inode_cmd.h>
 #include <linux/vs_base.h>
 #include <linux/vs_tag.h>
 
-#include <asm/errno.h>
 #include <asm/uaccess.h>
 
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/limit.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/limit.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/limit.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/limit.c	2007-08-15 22:29:48 +0200
@@ -11,13 +11,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/vs_context.h>
 #include <linux/vs_limit.h>
 #include <linux/vserver/limit.h>
-#include <linux/vserver/switch.h>
 #include <linux/vserver/limit_cmd.h>
 
-#include <asm/errno.h>
 #include <asm/uaccess.h>
 
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/monitor.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/monitor.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/monitor.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/monitor.c	2007-08-15 23:18:20 +0200
@@ -9,15 +9,10 @@
  *
  */
 
-#include <linux/errno.h>
 #include <linux/module.h>
-#include <linux/types.h>
-#include <linux/ctype.h>
 #include <linux/jiffies.h>
-
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
-#include <asm/unistd.h>
 
 #include <linux/vserver/monitor.h>
 #include <linux/vserver/debug_cmd.h>
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/network.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/network.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/network.c	2007-08-15 19:25:04 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/network.c	2007-08-15 23:20:58 +0200
@@ -15,13 +15,11 @@
  *
  */
 
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/rcupdate.h>
-#include <net/tcp.h>
 
-#include <asm/errno.h>
 #include <linux/vs_network.h>
-#include <linux/vserver/base.h>
 #include <linux/vserver/network_cmd.h>
 
 
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/proc.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/proc.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/proc.c	2007-08-11 23:33:53 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/proc.c	2007-08-15 23:24:01 +0200
@@ -16,21 +16,17 @@
  *
  */
 
-#include <linux/errno.h>
 #include <linux/proc_fs.h>
-#include <linux/sched.h>
+#include <asm/unistd.h>
+
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vs_cvirt.h>
 #include <linux/vs_inet.h>
 #include <linux/vs_inet6.h>
 
-#include <linux/vserver/switch.h>
 #include <linux/vserver/global.h>
 
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
-
 #include "cvirt_proc.h"
 #include "cacct_proc.h"
 #include "limit_proc.h"
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/sched.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/sched.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/sched.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/sched.c	2007-08-15 23:32:49 +0200
@@ -12,14 +12,13 @@
  *
  */
 
-#include <linux/sched.h>
 #include <linux/vs_context.h>
 #include <linux/vs_sched.h>
 #include <linux/vserver/sched_cmd.h>
 
-#include <asm/errno.h>
 #include <asm/uaccess.h>
 
+
 #define vxd_check_range(val, min, max) do {		\
 	vxlprintk((val < min) || (val > max),		\
 		"check_range(%ld,%ld,%ld)",		\
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/signal.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/signal.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/signal.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/signal.c	2007-08-15 23:34:41 +0200
@@ -11,9 +11,6 @@
  *
  */
 
-#include <linux/sched.h>
-
-#include <asm/errno.h>
 #include <asm/uaccess.h>
 
 #include <linux/vs_context.h>
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/space.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/space.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/space.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/space.c	2007-08-15 23:39:13 +0200
@@ -13,17 +13,13 @@
  */
 
 #include <linux/utsname.h>
-#include <linux/sched.h>
+#include <linux/nsproxy.h>
+#include <linux/err.h>
+#include <asm/uaccess.h>
+
 #include <linux/vs_context.h>
 #include <linux/vserver/space.h>
 #include <linux/vserver/space_cmd.h>
-#include <linux/dcache.h>
-#include <linux/mount.h>
-#include <linux/nsproxy.h>
-#include <linux/fs.h>
-
-#include <asm/errno.h>
-#include <asm/uaccess.h>
 
 
 atomic_t vs_global_nsproxy	= ATOMIC_INIT(0);
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/switch.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/switch.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/switch.c	2007-08-15 20:15:05 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/switch.c	2007-08-15 23:40:55 +0200
@@ -17,17 +17,13 @@
  *
  */
 
-#include <linux/linkage.h>
-#include <linux/sched.h>
-#include <linux/compat.h>
-#include <asm/errno.h>
-
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vserver/switch.h>
 
 #include "vci_config.h"
 
+
 static inline
 int vc_get_version(uint32_t id)
 {
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/sysctl.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/sysctl.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/sysctl.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/sysctl.c	2007-08-15 23:42:57 +0200
@@ -9,16 +9,11 @@
  *
  */
 
-#include <linux/errno.h>
 #include <linux/module.h>
-#include <linux/types.h>
 #include <linux/ctype.h>
 #include <linux/sysctl.h>
 #include <linux/parser.h>
-#include <linux/fs.h>
-
 #include <asm/uaccess.h>
-#include <asm/unistd.h>
 
 
 #define CTL_VSERVER	4242    /* unused? */
diff -NurpP linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/tag.c linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/tag.c
--- linux-2.6.22.2-vs2.3.0.17.3/kernel/vserver/tag.c	2007-08-15 20:48:24 +0200
+++ linux-2.6.22.2-vs2.3.0.17.4/kernel/vserver/tag.c	2007-08-15 23:45:03 +0200
@@ -9,20 +9,12 @@
  *
  */
 
-#include <linux/slab.h>
-#include <linux/types.h>
-
 #include <linux/sched.h>
-#include <linux/vserver/tag.h>
 #include <linux/vserver/debug.h>
-#include <linux/vserver/space.h>
 #include <linux/vs_tag.h>
 
 #include <linux/vserver/tag_cmd.h>
 
-#include <linux/err.h>
-#include <asm/errno.h>
-
 
 int dx_migrate_task(struct task_struct *p, tag_t tag)
 {