diff -u linux-2.6.11.7-vs2.0-pre2.1/kernel/vserver/signal.c linux-2.6.11.7-vs2.0-pre2.1/kernel/vserver/signal.c
--- linux-2.6.11.7-vs2.0-pre2.1/kernel/vserver/signal.c	2005-04-23 22:42:41 +0200
+++ linux-2.6.11.7-vs2.0-pre2.1/kernel/vserver/signal.c	2005-04-23 22:42:41 +0200
@@ -16,7 +16,7 @@
 #include <asm/uaccess.h>
 
 #include <linux/vs_context.h>
-#include <linux/vserver/signal.h>
+#include <linux/vserver/signal_cmd.h>
 
 
 int vc_ctx_kill(uint32_t id, void __user *data)
--- linux-2.6.11.7-vs2.0-pre2/include/linux/vserver/signal.h	2005-04-14 21:15:01 +0200
+++ linux-2.6.11.7-vs2.0-pre2.1/include/linux/vserver/signal.h	1970-01-01 01:00:00 +0100
@@ -1,27 +0,0 @@
-#ifndef _VX_SIGNAL_H
-#define _VX_SIGNAL_H
-
-#include "switch.h"
-
-/*  context signalling */
-
-#define VCMD_ctx_kill		VC_CMD(PROCTRL, 1, 0)
-#define VCMD_wait_exit		VC_CMD(EVENT, 99, 0)
-
-struct	vcmd_ctx_kill_v0 {
-	int32_t pid;
-	int32_t sig;
-};
-
-struct	vcmd_wait_exit_v0 {
-	int32_t a;
-	int32_t b;
-};
-
-#ifdef	__KERNEL__
-
-extern int vc_ctx_kill(uint32_t, void __user *);
-extern int vc_wait_exit(uint32_t, void __user *);
-
-#endif	/* __KERNEL__ */
-#endif	/* _VX_SIGNAL_H */
--- linux-2.6.11.7-vs2.0-pre2/include/linux/vserver/signal_cmd.h	1970-01-01 01:00:00 +0100
+++ linux-2.6.11.7-vs2.0-pre2.1/include/linux/vserver/signal_cmd.h	2005-04-23 19:04:48 +0200
@@ -0,0 +1,25 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
+
+/*  signalling vserver commands */
+
+#define VCMD_ctx_kill		VC_CMD(PROCTRL, 1, 0)
+#define VCMD_wait_exit		VC_CMD(EVENT, 99, 0)
+
+struct	vcmd_ctx_kill_v0 {
+	int32_t pid;
+	int32_t sig;
+};
+
+struct	vcmd_wait_exit_v0 {
+	int32_t a;
+	int32_t b;
+};
+
+#ifdef	__KERNEL__
+
+extern int vc_ctx_kill(uint32_t, void __user *);
+extern int vc_wait_exit(uint32_t, void __user *);
+
+#endif	/* __KERNEL__ */
+#endif	/* _VX_SIGNAL_CMD_H */
--- linux-2.6.11.7-vs2.0-pre2/kernel/vserver/switch.c	2005-04-23 00:53:15 +0200
+++ linux-2.6.11.7-vs2.0-pre2.1/kernel/vserver/switch.c	2005-04-23 22:36:30 +0200
@@ -37,11 +37,11 @@ vc_get_version(uint32_t id)
 #include <linux/vserver/debug_cmd.h>
 #include <linux/vserver/inode_cmd.h>
 #include <linux/vserver/dlimit_cmd.h>
+#include <linux/vserver/signal_cmd.h>
 
 #include <linux/vserver/legacy.h>
 #include <linux/vserver/namespace.h>
 #include <linux/vserver/inode.h>
-#include <linux/vserver/signal.h>
 #include <linux/vserver/dlimit.h>