4 files changed, 11 insertions, 6 deletions
diff --git a/include/ip6tables.h b/include/ip6tables.h
index 1956cf06..663da9ca 100644
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -4,6 +4,7 @@
 #include <netinet/ip.h>
 #include <xtables.h>
 #include <libiptc/libip6tc.h>
+#include <iptables/internal.h>
 
 #ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IP6T_SO_GET_REVISION_MATCH	68
diff --git a/include/iptables.h b/include/iptables.h
index f7ae0cc5..ee769a58 100644
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -4,6 +4,7 @@
 #include <netinet/ip.h>
 #include <xtables.h>
 #include <libiptc/libiptc.h>
+#include <iptables/internal.h>
 
 #ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IPT_SO_GET_REVISION_MATCH	(IPT_BASE_CTL + 2)
diff --git a/include/xtables/internal.h.in b/include/iptables/internal.h.in
index 5e34694a..849e1722 100644
--- a/include/xtables/internal.h.in
+++ b/include/iptables/internal.h.in
@@ -1,5 +1,5 @@
-#ifndef _XTABLES_INTERNAL_H
-#define _XTABLES_INTERNAL_H 1
+#ifndef IPTABLES_INTERNAL_H
+#define IPTABLES_INTERNAL_H 1
 
 #define IPTABLES_VERSION "@PACKAGE_VERSION@"
 
@@ -8,6 +8,4 @@
  */
 extern const char *program_name, *program_version;
 
-extern void _init(void);
-
-#endif /* _XTABLES_INTERNAL_H */
+#endif /* IPTABLES_INTERNAL_H */
diff --git a/include/xtables.h.in b/include/xtables.h.in
index 02750fb9..1455e9cd 100644
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -258,10 +258,15 @@ extern const struct xtables_pprot xtables_chain_protos[];
 extern u_int16_t xtables_parse_protocol(const char *s);
 
 #ifdef XTABLES_INTERNAL
+
+/* Shipped modules rely on this... */
+
 #	ifndef ARRAY_SIZE
 #		define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
 #	endif
-#	include <xtables/internal.h>
+
+extern void _init(void);
+
 #endif
 
 #endif /* _XTABLES_H */