diff --git a/[refs] b/[refs]
index 8e370afe1f3b..a8b1cbdb37d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9e6934502e46c363100245f137ddf0f4b1cb574
+refs/heads/master: 0afd4a21ba7d75e93fa79cf05d7a21774e149c0f
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 12e9a2957caf..6a9bb9753235 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -89,7 +89,6 @@ header-y += if_ppp.h
 header-y += if_slip.h
 header-y += if_strip.h
 header-y += if_tun.h
-header-y += if_tunnel.h
 header-y += in_route.h
 header-y += ioctl.h
 header-y += ip6_tunnel.h
@@ -235,6 +234,7 @@ unifdef-y += if_phonet.h
 unifdef-y += if_pppol2tp.h
 unifdef-y += if_pppox.h
 unifdef-y += if_tr.h
+unifdef-y += if_tunnel.h
 unifdef-y += if_vlan.h
 unifdef-y += igmp.h
 unifdef-y += inet_diag.h
diff --git a/trunk/include/linux/if_tunnel.h b/trunk/include/linux/if_tunnel.h
index aeab2cb32a9c..82c43624c067 100644
--- a/trunk/include/linux/if_tunnel.h
+++ b/trunk/include/linux/if_tunnel.h
@@ -2,7 +2,10 @@
 #define _IF_TUNNEL_H_
 
 #include <linux/types.h>
+
+#ifdef __KERNEL__
 #include <linux/ip.h>
+#endif
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
 #define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)