diff -NurpP --minimal linux-2.6.17.8-vs2.1.1-rc29.2.3/include/linux/vserver/cacct.h linux-2.6.17.8-vs2.1.1-rc29.2.4/include/linux/vserver/cacct.h
--- linux-2.6.17.8-vs2.1.1-rc29.2.3/include/linux/vserver/cacct.h	1970-01-01 01:00:00 +0100
+++ linux-2.6.17.8-vs2.1.1-rc29.2.4/include/linux/vserver/cacct.h	2006-08-19 16:25:15 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+
+
+enum sock_acc_field {
+	VXA_SOCK_UNSPEC = 0,
+	VXA_SOCK_UNIX,
+	VXA_SOCK_INET,
+	VXA_SOCK_INET6,
+	VXA_SOCK_PACKET,
+	VXA_SOCK_OTHER,
+	VXA_SOCK_SIZE	/* array size */
+};
+
+#endif	/* _VX_CACCT_H */
diff -NurpP --minimal linux-2.6.17.8-vs2.1.1-rc29.2.3/include/linux/vserver/cacct_def.h linux-2.6.17.8-vs2.1.1-rc29.2.4/include/linux/vserver/cacct_def.h
--- linux-2.6.17.8-vs2.1.1-rc29.2.3/include/linux/vserver/cacct_def.h	2006-08-19 03:15:08 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29.2.4/include/linux/vserver/cacct_def.h	2006-08-19 16:25:46 +0200
@@ -2,18 +2,9 @@
 #define _VX_CACCT_DEF_H
 
 #include <asm/atomic.h>
+#include <linux/vserver/cacct.h>
 
 
-enum sock_acc_field {
-	VXA_SOCK_UNSPEC = 0,
-	VXA_SOCK_UNIX,
-	VXA_SOCK_INET,
-	VXA_SOCK_INET6,
-	VXA_SOCK_PACKET,
-	VXA_SOCK_OTHER,
-	VXA_SOCK_SIZE	/* array size */
-};
-
 struct _vx_sock_acc {
 	atomic_t count;
 	atomic_t total;
diff -NurpP --minimal linux-2.6.17.8-vs2.1.1-rc29.2.3/include/linux/vserver/cvirt.h linux-2.6.17.8-vs2.1.1-rc29.2.4/include/linux/vserver/cvirt.h
--- linux-2.6.17.8-vs2.1.1-rc29.2.3/include/linux/vserver/cvirt.h	2006-07-09 17:07:13 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29.2.4/include/linux/vserver/cvirt.h	2006-08-19 16:24:55 +0200
@@ -21,6 +21,4 @@ int vx_uts_virt_handler(struct ctl_table
 int vx_do_syslog(int, char __user *, int);
 
 #endif	/* __KERNEL__ */
-#else	/* _VX_CVIRT_H */
-#warning duplicate inclusion
 #endif	/* _VX_CVIRT_H */