diff -urN --exclude-from=/usr/src/diff.exclude linux-2.6.7-orig/include/linux/netfilter_arp/arp_tables.h linux-2.6.7-user/include/linux/netfilter_arp/arp_tables.h
--- linux-2.6.7-orig/include/linux/netfilter_arp/arp_tables.h	2004-06-16 07:19:03.000000000 +0200
+++ linux-2.6.7-user/include/linux/netfilter_arp/arp_tables.h	2004-06-18 17:03:04.000000000 +0200
@@ -16,7 +16,7 @@
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #endif
-
+#include <linux/compiler.h>				/* __user */
 #include <linux/netfilter_arp.h>
 
 #define ARPT_FUNCTION_MAXNAMELEN 30
diff -urN --exclude-from=/usr/src/diff.exclude linux-2.6.7-orig/include/linux/netfilter_ipv4/ip_tables.h linux-2.6.7-user/include/linux/netfilter_ipv4/ip_tables.h
--- linux-2.6.7-orig/include/linux/netfilter_ipv4/ip_tables.h	2004-06-16 07:19:29.000000000 +0200
+++ linux-2.6.7-user/include/linux/netfilter_ipv4/ip_tables.h	2004-06-18 21:28:32.000000000 +0200
@@ -22,6 +22,7 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #endif
+#include <linux/compiler.h>			/* __user */
 #include <linux/netfilter_ipv4.h>
 
 #define IPT_FUNCTION_MAXNAMELEN 30
@@ -283,8 +284,6 @@
 	struct ipt_entry entrytable[0];
 };
 
-extern struct semaphore ipt_mutex;
-
 /* Standard return verdict, or do jump. */
 #define IPT_STANDARD_TARGET ""
 /* Error verdict. */
@@ -336,9 +335,11 @@
 /*
  *	Main firewall chains definitions and global var's definitions.
  */
-static DECLARE_MUTEX(ipt_mutex);
 #ifdef __KERNEL__
 
+extern struct semaphore ipt_mutex;
+static DECLARE_MUTEX(ipt_mutex);
+
 #include <linux/init.h>
 extern void ipt_init(void) __init;
 
diff -urN --exclude-from=/usr/src/diff.exclude linux-2.6.7-orig/include/linux/netfilter_ipv6/ip6_tables.h linux-2.6.7-user/include/linux/netfilter_ipv6/ip6_tables.h
--- linux-2.6.7-orig/include/linux/netfilter_ipv6/ip6_tables.h	2004-06-16 07:20:04.000000000 +0200
+++ linux-2.6.7-user/include/linux/netfilter_ipv6/ip6_tables.h	2004-06-18 21:29:02.000000000 +0200
@@ -22,6 +22,7 @@
 #include <linux/ipv6.h>
 #include <linux/skbuff.h>
 #endif
+#include <linux/compiler.h>				/* __user */
 #include <linux/netfilter_ipv6.h>
 
 #define IP6T_FUNCTION_MAXNAMELEN 30
@@ -106,8 +107,6 @@
 	u_int64_t pcnt, bcnt;			/* Packet and byte counters */
 };
 
-static DECLARE_MUTEX(ip6t_mutex);
-
 /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
 #define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 
 					   protocols */
@@ -345,6 +344,8 @@
 
 #ifdef __KERNEL__
 
+static DECLARE_MUTEX(ip6t_mutex);
+
 #include <linux/init.h>
 extern void ip6t_init(void) __init;