diff -NurpP linux-2.6.18-vs2.1.1-rc37/include/linux/vserver/history.h linux-2.6.18-vs2.1.1-rc37.1/include/linux/vserver/history.h
--- linux-2.6.18-vs2.1.1-rc37/include/linux/vserver/history.h	2006-09-25 15:40:02 +0200
+++ linux-2.6.18-vs2.1.1-rc37.1/include/linux/vserver/history.h	2006-10-07 17:50:52 +0200
@@ -1,24 +1,6 @@
 #ifndef _VX_HISTORY_H
 #define _VX_HISTORY_H
 
-#ifdef	CONFIG_VSERVER_HISTORY
-
-extern unsigned volatile int vxh_active;
-
-struct _vxhe_vxi {
-	struct vx_info *ptr;
-	unsigned xid;
-	unsigned usecnt;
-	unsigned tasks;
-};
-
-struct _vxhe_set_clr {
-	void *data;
-};
-
-struct _vxhe_loc_lookup {
-	unsigned arg;
-};
 
 enum {
 	VXH_UNUSED=0,
@@ -40,6 +22,21 @@ enum {
 	VXH_CREATE_VX_INFO,
 };
 
+struct _vxhe_vxi {
+	struct vx_info *ptr;
+	unsigned xid;
+	unsigned usecnt;
+	unsigned tasks;
+};
+
+struct _vxhe_set_clr {
+	void *data;
+};
+
+struct _vxhe_loc_lookup {
+	unsigned arg;
+};
+
 struct _vx_hist_entry {
 	void *loc;
 	unsigned short seq;
@@ -51,6 +48,10 @@ struct _vx_hist_entry {
 	};
 };
 
+#ifdef	CONFIG_VSERVER_HISTORY
+
+extern unsigned volatile int vxh_active;
+
 struct _vx_hist_entry *vxh_advance(void *loc);
 
 
diff -NurpP linux-2.6.18-vs2.1.1-rc37/include/linux/vserver/monitor.h linux-2.6.18-vs2.1.1-rc37.1/include/linux/vserver/monitor.h
--- linux-2.6.18-vs2.1.1-rc37/include/linux/vserver/monitor.h	2006-09-25 15:40:02 +0200
+++ linux-2.6.18-vs2.1.1-rc37.1/include/linux/vserver/monitor.h	2006-10-07 17:50:13 +0200
@@ -1,8 +1,6 @@
 #ifndef _VX_MONITOR_H
 #define _VX_MONITOR_H
 
-#include <linux/config.h>
-
 
 enum {
 	VXM_UNUSED = 0,