extensions: remove unwanted/add needed includes for IPv4 exts

Most touched files do not use anything from ip_tables.h, so
remove that #include. multiport instead, does need it (ipt_entry).

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index 2bb2292a56e5c9a8037287c74f292dd063bfe7e1..279aacff4b5cff2cf46a2b7939baea1ff9c8ccf3 100644 (file)
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -16,7 +16,6 @@
 #endif
 
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_CLUSTERIP.h>
 
 static void CLUSTERIP_help(void)

diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index a3e14622cf44d92201d69c1158efbaa2c203724b..f0a236925edf30c00cf3dc8e56a2fc0135b568b9 100644 (file)
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <iptables.h>
+#include <iptables.h> /* get_kernel_version */
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/nf_nat.h>
 

diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c
index b107d16e77507c8b75044b12cb67d473a121437a..bf1f8a5a4c5474601a1ee650f1996bc024a6c258 100644 (file)
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -14,7 +14,6 @@
 #include <getopt.h>
 
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ECN.h>
 
 static void ECN_help(void)

diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 4da412c14908b15ef79298fb55d99e7585754705..ebcb5742b3756a07dd9b53693415bf72b7e2864c 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -6,7 +6,6 @@
 #include <syslog.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_LOG.h>
 
 #define LOG_DEFAULT_LEVEL LOG_WARNING

diff --git a/extensions/libipt_MIRROR.c b/extensions/libipt_MIRROR.c
index 3a3a85d4a219a2a65d059c8f2a0cdb1e02a986e0..81964dd72635028f207dce18c30c2078ea1a1edd 100644 (file)
--- a/extensions/libipt_MIRROR.c
+++ b/extensions/libipt_MIRROR.c
@@ -5,7 +5,6 @@
 #include <getopt.h>
 
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 
 static void MIRROR_help(void)
 {

diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index b1d79ce22359adf23a3b66f26fd109cfe19b89bd..f718d2c853d3a300c15cb64c44503daa7afdd7a3 100644 (file)
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/nf_nat.h>
 
 #define MODULENAME "NETMAP"

diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 98d8dcbade84c4e5d3af6edb7b3b45e1d298ff23..5b23f547b8aa1bc65d698c850d85847d099b5974 100644 (file)
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_REJECT.h>
 #include <linux/version.h>
 

diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index 444a5208b590cd962115b46a8f855a0a5cb2b711..dabdb3f6172d441da3a28f2c64e08fcdc856a838 100644 (file)
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/nf_nat.h>
 /* For 64bit kernel / 32bit userspace */
 #include <linux/netfilter_ipv4/ipt_SAME.h>

diff --git a/extensions/libipt_SET.c b/extensions/libipt_SET.c
index e9bdab481a0d141b2f21e25fc3143f93531d5ce4..5da41a0eaaff0637c44718a7ab332e44224bd7d0 100644 (file)
--- a/extensions/libipt_SET.c
+++ b/extensions/libipt_SET.c
@@ -17,7 +17,6 @@
 #include <ctype.h>
 
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ip_set.h>
 #include <linux/netfilter_ipv4/ipt_set.h>
 #include "libipt_set.h"

diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c
index 2501877791127c809a550f5fa34d1202c7dd36c4..0e2be0b6f4db2f0b34e2c57e0da718da07362c88 100644 (file)
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -11,7 +11,6 @@
 #include <getopt.h>
 #include <xtables.h>
 
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_TTL.h>
 
 #define IPT_TTL_USED   1

diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index 9633a87b6e51415ee8f20ce55c786497eb87789d..3fa91f2d7a09b05d401d706583999610df2147d2 100644 (file)
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -16,7 +16,6 @@
 #include <syslog.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 /* For 64bit kernel / 32bit userspace */
 #include <linux/netfilter_ipv4/ipt_ULOG.h>
 

diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c
index 22b35d48553be0c55a9f23f334f36d024ca9b6b4..ecd51b510c2e72b71f9a31a524fedd00e94669c4 100644 (file)
--- a/extensions/libipt_addrtype.c
+++ b/extensions/libipt_addrtype.c
@@ -8,7 +8,6 @@
 #include <getopt.h>
 #include <xtables.h>
 
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_addrtype.h>
 
 /* from linux/rtnetlink.h, must match order of enumeration */

diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c
index 0f8849df0ae1619f7d0a6b222c99210c5d086068..3ee190e9825d59591cd751e7cfe57e4bda652406 100644 (file)
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -13,7 +13,6 @@
 #include <getopt.h>
 
 #include <xtables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ecn.h>
 
 static void ecn_help(void)

diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c
index 964c19a404552dd2377c7ace3ef1cff5ad639a29..1271fbadde5e9f44c2fcc19e35767826fad98451 100644 (file)
--- a/extensions/libipt_policy.c
+++ b/extensions/libipt_policy.c
@@ -12,7 +12,6 @@
 #include <arpa/inet.h>
 #include <xtables.h>
 
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_policy.h>
 
 /*

diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c
index 67f0b1ad9a79cf6b6e53e8e2540661f8166f72ec..019a556a7ab5b7a850a875d84b9cb4e2564c8fbd 100644 (file)
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -11,7 +11,6 @@
 #include <getopt.h>
 #include <xtables.h>
 
-#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ttl.h>
 
 static void ttl_help(void)

diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 5700f8a34110728435f12ec6a4dc0d7dad059f69..54b9e2c4cdedfa6d87045991f239e7999077e1e4 100644 (file)
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -8,6 +8,7 @@
 #include <xtables.h>
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter/xt_multiport.h>