diff -urN ipset-4.1.orig/kernel/ip_set.c ipset-4.1/kernel/ip_set.c
--- ipset-4.1.orig/kernel/ip_set.c	2009-11-11 20:33:55 +0200
+++ ipset-4.1/kernel/ip_set.c	2009-12-23 05:30:26 +0200
@@ -19,7 +19,7 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/random.h>
-#include <linux/netfilter_ipv4/ip_set_jhash.h>
+#include "ip_set_jhash.h"
 #include <linux/errno.h>
 #include <linux/capability.h>
 #include <asm/uaccess.h>
@@ -34,7 +34,7 @@
 #define ASSERT_READ_LOCK(x)
 #define ASSERT_WRITE_LOCK(x)
 #include <linux/netfilter.h>
-#include <linux/netfilter_ipv4/ip_set.h>
+#include "ip_set.h"
 
 static struct list_head set_type_list;		/* all registered sets */
 static struct ip_set **ip_set_list;		/* all individual sets */
diff -urN ipset-4.1.orig/kernel/ip_set.h ipset-4.1/kernel/ip_set.h
--- ipset-4.1.orig/kernel/ip_set.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set.h	2009-12-23 05:36:42 +0200
@@ -309,8 +309,8 @@
 #define IPSET_VALIGN(len, old) ((old) ? (len) : IPSET_ALIGN(len))
 
 #ifdef __KERNEL__
-#include <linux/netfilter_ipv4/ip_set_compat.h>
-#include <linux/netfilter_ipv4/ip_set_malloc.h>
+#include "ip_set_compat.h"
+#include "ip_set_malloc.h"
 
 #define ip_set_printk(format, args...) 			\
 	do {							\
diff -urN ipset-4.1.orig/kernel/ip_set_iphash.c ipset-4.1/kernel/ip_set_iphash.c
--- ipset-4.1.orig/kernel/ip_set_iphash.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_iphash.c	2009-12-23 05:30:26 +0200
@@ -11,7 +11,7 @@
 #include <linux/moduleparam.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
-#include <linux/netfilter_ipv4/ip_set_jhash.h>
+#include "ip_set_jhash.h"
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
@@ -20,7 +20,7 @@
 
 #include <net/ip.h>
 
-#include <linux/netfilter_ipv4/ip_set_iphash.h>
+#include "ip_set_iphash.h"
 
 static int limit = MAX_RANGE;
 
diff -urN ipset-4.1.orig/kernel/ip_set_iphash.h ipset-4.1/kernel/ip_set_iphash.h
--- ipset-4.1.orig/kernel/ip_set_iphash.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_iphash.h	2009-12-23 05:32:47 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_IPHASH_H
 #define __IP_SET_IPHASH_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
+#include "ip_set.h"
+#include "ip_set_hashes.h"
 
 #define SETTYPE_NAME		"iphash"
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipmap.c ipset-4.1/kernel/ip_set_ipmap.c
--- ipset-4.1.orig/kernel/ip_set_ipmap.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_ipmap.c	2009-12-23 05:30:26 +0200
@@ -17,7 +17,7 @@
 #include <asm/bitops.h>
 #include <linux/spinlock.h>
 
-#include <linux/netfilter_ipv4/ip_set_ipmap.h>
+#include "ip_set_ipmap.h"
 
 static inline ip_set_ip_t
 ip_to_id(const struct ip_set_ipmap *map, ip_set_ip_t ip)
diff -urN ipset-4.1.orig/kernel/ip_set_ipmap.h ipset-4.1/kernel/ip_set_ipmap.h
--- ipset-4.1.orig/kernel/ip_set_ipmap.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_ipmap.h	2009-12-23 05:33:13 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_IPMAP_H
 #define __IP_SET_IPMAP_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
+#include "ip_set.h"
+#include "ip_set_bitmaps.h"
 
 #define SETTYPE_NAME		"ipmap"
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipporthash.c ipset-4.1/kernel/ip_set_ipporthash.c
--- ipset-4.1.orig/kernel/ip_set_ipporthash.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_ipporthash.c	2009-12-23 05:30:26 +0200
@@ -13,7 +13,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/skbuff.h>
-#include <linux/netfilter_ipv4/ip_set_jhash.h>
+#include "ip_set_jhash.h"
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
@@ -22,8 +22,8 @@
 
 #include <net/ip.h>
 
-#include <linux/netfilter_ipv4/ip_set_ipporthash.h>
-#include <linux/netfilter_ipv4/ip_set_getport.h>
+#include "ip_set_ipporthash.h"
+#include "ip_set_getport.h"
 
 static int limit = MAX_RANGE;
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipporthash.h ipset-4.1/kernel/ip_set_ipporthash.h
--- ipset-4.1.orig/kernel/ip_set_ipporthash.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_ipporthash.h	2009-12-23 05:34:31 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_IPPORTHASH_H
 #define __IP_SET_IPPORTHASH_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
+#include "ip_set.h"
+#include "ip_set_hashes.h"
 
 #define SETTYPE_NAME			"ipporthash"
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipportiphash.c ipset-4.1/kernel/ip_set_ipportiphash.c
--- ipset-4.1.orig/kernel/ip_set_ipportiphash.c	2009-11-11 21:17:01 +0200
+++ ipset-4.1/kernel/ip_set_ipportiphash.c	2009-12-23 05:30:26 +0200
@@ -13,7 +13,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/skbuff.h>
-#include <linux/netfilter_ipv4/ip_set_jhash.h>
+#include "ip_set_jhash.h"
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
@@ -22,8 +22,8 @@
 
 #include <net/ip.h>
 
-#include <linux/netfilter_ipv4/ip_set_ipportiphash.h>
-#include <linux/netfilter_ipv4/ip_set_getport.h>
+#include "ip_set_ipportiphash.h"
+#include "ip_set_getport.h"
 
 static int limit = MAX_RANGE;
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipportiphash.h ipset-4.1/kernel/ip_set_ipportiphash.h
--- ipset-4.1.orig/kernel/ip_set_ipportiphash.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_ipportiphash.h	2009-12-23 05:33:37 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_IPPORTIPHASH_H
 #define __IP_SET_IPPORTIPHASH_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
+#include "ip_set.h"
+#include "ip_set_hashes.h"
 
 #define SETTYPE_NAME			"ipportiphash"
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipportnethash.c ipset-4.1/kernel/ip_set_ipportnethash.c
--- ipset-4.1.orig/kernel/ip_set_ipportnethash.c	2009-11-11 21:12:42 +0200
+++ ipset-4.1/kernel/ip_set_ipportnethash.c	2009-12-23 05:30:26 +0200
@@ -13,7 +13,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/skbuff.h>
-#include <linux/netfilter_ipv4/ip_set_jhash.h>
+#include "ip_set_jhash.h"
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
@@ -22,8 +22,8 @@
 
 #include <net/ip.h>
 
-#include <linux/netfilter_ipv4/ip_set_ipportnethash.h>
-#include <linux/netfilter_ipv4/ip_set_getport.h>
+#include "ip_set_ipportnethash.h"
+#include "ip_set_getport.h"
 
 static int limit = MAX_RANGE;
 
diff -urN ipset-4.1.orig/kernel/ip_set_ipportnethash.h ipset-4.1/kernel/ip_set_ipportnethash.h
--- ipset-4.1.orig/kernel/ip_set_ipportnethash.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_ipportnethash.h	2009-12-23 05:33:00 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_IPPORTNETHASH_H
 #define __IP_SET_IPPORTNETHASH_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
+#include "ip_set.h"
+#include "ip_set_hashes.h"
 
 #define SETTYPE_NAME			"ipportnethash"
 
diff -urN ipset-4.1.orig/kernel/ip_set_iptree.c ipset-4.1/kernel/ip_set_iptree.c
--- ipset-4.1.orig/kernel/ip_set_iptree.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_iptree.c	2009-12-23 05:30:26 +0200
@@ -20,9 +20,9 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
-#include <linux/netfilter_ipv4/ip_set_iptree.h>
+#include "ip_set.h"
+#include "ip_set_bitmaps.h"
+#include "ip_set_iptree.h"
 
 static int limit = MAX_RANGE;
 
diff -urN ipset-4.1.orig/kernel/ip_set_iptree.h ipset-4.1/kernel/ip_set_iptree.h
--- ipset-4.1.orig/kernel/ip_set_iptree.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_iptree.h	2009-12-23 05:33:51 +0200
@@ -1,7 +1,7 @@
 #ifndef __IP_SET_IPTREE_H
 #define __IP_SET_IPTREE_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
+#include "ip_set.h"
 
 #define SETTYPE_NAME		"iptree"
 
diff -urN ipset-4.1.orig/kernel/ip_set_iptreemap.c ipset-4.1/kernel/ip_set_iptreemap.c
--- ipset-4.1.orig/kernel/ip_set_iptreemap.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_iptreemap.c	2009-12-23 05:30:26 +0200
@@ -24,9 +24,9 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
-#include <linux/netfilter_ipv4/ip_set_iptreemap.h>
+#include "ip_set.h"
+#include "ip_set_bitmaps.h"
+#include "ip_set_iptreemap.h"
 
 #define IPTREEMAP_DEFAULT_GC_TIME (5 * 60)
 #define IPTREEMAP_DESTROY_SLEEP (100)
diff -urN ipset-4.1.orig/kernel/ip_set_iptreemap.h ipset-4.1/kernel/ip_set_iptreemap.h
--- ipset-4.1.orig/kernel/ip_set_iptreemap.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_iptreemap.h	2009-12-23 05:34:55 +0200
@@ -1,7 +1,7 @@
 #ifndef __IP_SET_IPTREEMAP_H
 #define __IP_SET_IPTREEMAP_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
+#include "ip_set.h"
 
 #define SETTYPE_NAME		"iptreemap"
 
diff -urN ipset-4.1.orig/kernel/ip_set_macipmap.c ipset-4.1/kernel/ip_set_macipmap.c
--- ipset-4.1.orig/kernel/ip_set_macipmap.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_macipmap.c	2009-12-23 05:30:26 +0200
@@ -19,7 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/if_ether.h>
 
-#include <linux/netfilter_ipv4/ip_set_macipmap.h>
+#include "ip_set_macipmap.h"
 
 static int
 macipmap_utest(struct ip_set *set, const void *data, u_int32_t size)
diff -urN ipset-4.1.orig/kernel/ip_set_macipmap.h ipset-4.1/kernel/ip_set_macipmap.h
--- ipset-4.1.orig/kernel/ip_set_macipmap.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_macipmap.h	2009-12-23 05:34:03 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_MACIPMAP_H
 #define __IP_SET_MACIPMAP_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
+#include "ip_set.h"
+#include "ip_set_bitmaps.h"
 
 #define SETTYPE_NAME		"macipmap"
 
diff -urN ipset-4.1.orig/kernel/ip_set_nethash.c ipset-4.1/kernel/ip_set_nethash.c
--- ipset-4.1.orig/kernel/ip_set_nethash.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_nethash.c	2009-12-23 05:30:26 +0200
@@ -11,7 +11,7 @@
 #include <linux/moduleparam.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
-#include <linux/netfilter_ipv4/ip_set_jhash.h>
+#include "ip_set_jhash.h"
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
@@ -20,7 +20,7 @@
 
 #include <net/ip.h>
 
-#include <linux/netfilter_ipv4/ip_set_nethash.h>
+#include "ip_set_nethash.h"
 
 static int limit = MAX_RANGE;
 
diff -urN ipset-4.1.orig/kernel/ip_set_nethash.h ipset-4.1/kernel/ip_set_nethash.h
--- ipset-4.1.orig/kernel/ip_set_nethash.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_nethash.h	2009-12-23 05:34:16 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_NETHASH_H
 #define __IP_SET_NETHASH_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_hashes.h>
+#include "ip_set.h"
+#include "ip_set_hashes.h"
 
 #define SETTYPE_NAME		"nethash"
 
diff -urN ipset-4.1.orig/kernel/ip_set_portmap.c ipset-4.1/kernel/ip_set_portmap.c
--- ipset-4.1.orig/kernel/ip_set_portmap.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_portmap.c	2009-12-23 05:30:26 +0200
@@ -19,8 +19,8 @@
 
 #include <net/ip.h>
 
-#include <linux/netfilter_ipv4/ip_set_portmap.h>
-#include <linux/netfilter_ipv4/ip_set_getport.h>
+#include "ip_set_portmap.h"
+#include "ip_set_getport.h"
 
 static inline int
 portmap_test(const struct ip_set *set, ip_set_ip_t port)
diff -urN ipset-4.1.orig/kernel/ip_set_portmap.h ipset-4.1/kernel/ip_set_portmap.h
--- ipset-4.1.orig/kernel/ip_set_portmap.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_portmap.h	2009-12-23 05:34:46 +0200
@@ -1,8 +1,8 @@
 #ifndef __IP_SET_PORTMAP_H
 #define __IP_SET_PORTMAP_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
+#include "ip_set.h"
+#include "ip_set_bitmaps.h"
 
 #define SETTYPE_NAME		"portmap"
 
diff -urN ipset-4.1.orig/kernel/ip_set_setlist.c ipset-4.1/kernel/ip_set_setlist.c
--- ipset-4.1.orig/kernel/ip_set_setlist.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ip_set_setlist.c	2009-12-23 05:30:26 +0200
@@ -12,9 +12,9 @@
 #include <linux/skbuff.h>
 #include <linux/errno.h>
 
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
-#include <linux/netfilter_ipv4/ip_set_setlist.h>
+#include "ip_set.h"
+#include "ip_set_bitmaps.h"
+#include "ip_set_setlist.h"
 
 /*
  * before ==> index, ref
diff -urN ipset-4.1.orig/kernel/ip_set_setlist.h ipset-4.1/kernel/ip_set_setlist.h
--- ipset-4.1.orig/kernel/ip_set_setlist.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ip_set_setlist.h	2009-12-23 05:33:24 +0200
@@ -1,7 +1,7 @@
 #ifndef __IP_SET_SETLIST_H
 #define __IP_SET_SETLIST_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
+#include "ip_set.h"
 
 #define SETTYPE_NAME			"setlist"
 
diff -urN ipset-4.1.orig/kernel/ipt_set.c ipset-4.1/kernel/ipt_set.c
--- ipset-4.1.orig/kernel/ipt_set.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ipt_set.c	2009-12-23 05:30:26 +0200
@@ -23,8 +23,8 @@
 #else
 #include <linux/netfilter/x_tables.h>
 #endif
-#include <linux/netfilter_ipv4/ip_set.h>
-#include <linux/netfilter_ipv4/ipt_set.h>
+#include "ip_set.h"
+#include "ipt_set.h"
 
 static inline int
 match_set(const struct ipt_set_info *info,
diff -urN ipset-4.1.orig/kernel/ipt_SET.c ipset-4.1/kernel/ipt_SET.c
--- ipset-4.1.orig/kernel/ipt_SET.c	2009-11-10 22:45:41 +0200
+++ ipset-4.1/kernel/ipt_SET.c	2009-12-23 05:30:27 +0200
@@ -25,7 +25,7 @@
 #else
 #include <linux/netfilter/x_tables.h>
 #endif
-#include <linux/netfilter_ipv4/ipt_set.h>
+#include "ipt_set.h"
 
 static unsigned int
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
diff -urN ipset-4.1.orig/kernel/ipt_set.h ipset-4.1/kernel/ipt_set.h
--- ipset-4.1.orig/kernel/ipt_set.h	2009-11-10 22:46:06 +0200
+++ ipset-4.1/kernel/ipt_set.h	2009-12-23 05:33:45 +0200
@@ -1,7 +1,7 @@
 #ifndef _IPT_SET_H
 #define _IPT_SET_H
 
-#include <linux/netfilter_ipv4/ip_set.h>
+#include "ip_set.h"
 
 struct ipt_set_info {
 	ip_set_id_t index;