diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_base.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_base.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_base.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_base.h 2006-01-27 21:54:14 +0100 @@ -1,7 +1,6 @@ #ifndef _VX_VS_BASE_H #define _VX_VS_BASE_H - #include "vserver/context.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_context.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_context.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_context.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_context.h 2006-01-27 21:54:42 +0100 @@ -1,7 +1,6 @@ #ifndef _VX_VS_CONTEXT_H #define _VX_VS_CONTEXT_H - #include #include "vserver/debug.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_cvirt.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_cvirt.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_cvirt.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_cvirt.h 2006-01-27 21:55:00 +0100 @@ -1,7 +1,6 @@ #ifndef _VX_VS_CVIRT_H #define _VX_VS_CVIRT_H - #include "vserver/cvirt.h" #include "vserver/debug.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_dlimit.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_dlimit.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_dlimit.h 2006-01-25 05:34:51 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_dlimit.h 2006-01-27 21:55:39 +0100 @@ -1,7 +1,6 @@ #ifndef _VX_VS_DLIMIT_H #define _VX_VS_DLIMIT_H - #include "vserver/dlimit.h" #include "vserver/debug.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_limit.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_limit.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_limit.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_limit.h 2006-01-27 21:55:58 +0100 @@ -1,7 +1,6 @@ #ifndef _VX_VS_LIMIT_H #define _VX_VS_LIMIT_H - #include "vserver/limit.h" #include "vserver/debug.h" #include "vserver/limit_int.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_memory.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_memory.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_memory.h 2006-01-22 07:19:41 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_memory.h 2006-01-27 21:58:27 +0100 @@ -1,7 +1,7 @@ #ifndef _VX_VS_MEMORY_H #define _VX_VS_MEMORY_H - +#include #include "vserver/limit.h" #include "vserver/debug.h" #include "vserver/limit_int.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_network.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_network.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_network.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_network.h 2006-01-27 21:59:02 +0100 @@ -1,7 +1,6 @@ #ifndef _NX_VS_NETWORK_H #define _NX_VS_NETWORK_H - #include "vserver/network.h" #include "vserver/debug.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_sched.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_sched.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_sched.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_sched.h 2006-01-27 21:59:21 +0100 @@ -1,10 +1,7 @@ #ifndef _VX_VS_SCHED_H #define _VX_VS_SCHED_H -#ifndef CONFIG_VSERVER -#warning config options missing -#endif - +#include #include "vserver/sched.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_socket.h linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_socket.h --- linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vs_socket.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/include/linux/vs_socket.h 2006-01-27 21:59:38 +0100 @@ -1,7 +1,6 @@ #ifndef _VX_VS_SOCKET_H #define _VX_VS_SOCKET_H - #include "vserver/debug.h" diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/cvirt.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/cvirt.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/cvirt.c 2006-01-21 18:28:04 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/cvirt.c 2006-01-27 22:03:20 +0100 @@ -10,7 +10,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/cvirt_init.h linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/cvirt_init.h --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/cvirt_init.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/cvirt_init.h 2006-01-27 22:01:53 +0100 @@ -1,4 +1,7 @@ +#include + + extern uint64_t vx_idle_jiffies(void); static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/debug.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/debug.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/debug.c 2006-01-21 18:28:14 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/debug.c 2006-01-27 22:03:30 +0100 @@ -7,7 +7,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/inode.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/inode.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/inode.c 2006-01-25 08:07:11 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/inode.c 2006-01-27 22:03:05 +0100 @@ -9,6 +9,7 @@ * */ +#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/legacy.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/legacy.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/legacy.c 2006-01-21 18:28:14 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/legacy.c 2006-01-27 22:03:40 +0100 @@ -10,7 +10,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/legacynet.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/legacynet.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/legacynet.c 2006-01-21 18:28:14 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/legacynet.c 2006-01-27 22:03:49 +0100 @@ -11,7 +11,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/limit.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/limit.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/limit.c 2006-01-21 18:28:14 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/limit.c 2006-01-27 22:03:58 +0100 @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/limit_init.h linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/limit_init.h --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/limit_init.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/limit_init.h 2006-01-27 22:02:11 +0100 @@ -1,4 +1,7 @@ +#include + + static inline void vx_info_init_limit(struct _vx_limit *limit) { int lim; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/namespace.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/namespace.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/namespace.c 2006-01-21 18:28:03 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/namespace.c 2006-01-27 22:04:09 +0100 @@ -10,7 +10,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/proc.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/proc.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/proc.c 2006-01-21 18:28:00 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/proc.c 2006-01-27 22:04:20 +0100 @@ -15,7 +15,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/signal.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/signal.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/signal.c 2006-01-21 18:28:08 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/signal.c 2006-01-27 22:04:35 +0100 @@ -9,7 +9,6 @@ * */ -#include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/sysctl.c linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/sysctl.c --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/sysctl.c 2006-01-25 05:34:51 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/sysctl.c 2006-01-27 22:04:44 +0100 @@ -9,7 +9,6 @@ * */ -#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/vci_config.h linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/vci_config.h --- linux-2.6.16-rc1-vs2.1.0.7.1/kernel/vserver/vci_config.h 2006-01-25 06:09:52 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.2/kernel/vserver/vci_config.h 2006-01-27 22:01:03 +0100 @@ -1,4 +1,7 @@ +#include + + enum { VCI_KCBIT_LEGACY = 1, VCI_KCBIT_LEGACYNET,