include: restore linux header includes in public headers

The previous commits reorganized the public headers to drop includes
of linux kernel headers.

Restore the previous situation because otherwise the change might
break compilation for users who rely on certain headers getting dragged
in by libnl3.

25 files changed, 31 insertions, 0 deletions

diff --git a/include/netlink/cli/ct.h b/include/netlink/cli/ct.h
index 518d63e..ebe7c9d 100644
--- a/include/netlink/cli/ct.h
+++ b/include/netlink/cli/ct.h
@@ -13,6 +13,7 @@
 #define __NETLINK_CLI_CT_H_
 
 #include <netlink/netfilter/ct.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 
 extern struct nfnl_ct *nl_cli_ct_alloc(void);
 extern struct nl_cache *nl_cli_ct_alloc_cache(struct nl_sock *);
diff --git a/include/netlink/cli/exp.h b/include/netlink/cli/exp.h
index 27440dd..b2418f8 100644
--- a/include/netlink/cli/exp.h
+++ b/include/netlink/cli/exp.h
@@ -14,6 +14,7 @@
 #define __NETLINK_CLI_EXP_H_
 
 #include <netlink/netfilter/exp.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 
 extern struct nfnl_exp *nl_cli_exp_alloc(void);
 extern struct nl_cache *nl_cli_exp_alloc_cache(struct nl_sock *);
diff --git a/include/netlink/idiag/idiagnl.h b/include/netlink/idiag/idiagnl.h
index d541955..b69cbf1 100644
--- a/include/netlink/idiag/idiagnl.h
+++ b/include/netlink/idiag/idiagnl.h
@@ -13,6 +13,7 @@
 #define NETLINK_IDIAGNL_H_
 
 #include <netlink/netlink.h>
+#include <linux/sock_diag.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/netfilter/exp.h b/include/netlink/netfilter/exp.h
index 8a8a13e..736af24 100644
--- a/include/netlink/netfilter/exp.h
+++ b/include/netlink/netfilter/exp.h
@@ -20,6 +20,8 @@
 #include <netlink/cache.h>
 #include <netlink/msg.h>
 
+#include <linux/version.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h
index 08f366e..41d48c6 100644
--- a/include/netlink/netlink.h
+++ b/include/netlink/netlink.h
@@ -22,6 +22,10 @@
 #include <sys/time.h>
 #include <netdb.h>
 #include <netlink/netlink-compat.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/genetlink.h>
+#include <linux/netfilter/nfnetlink.h>
 #include <netinet/tcp.h>
 #include <netlink/version.h>
 #include <netlink/errno.h>
diff --git a/include/netlink/route/act/gact.h b/include/netlink/route/act/gact.h
index 7ea138a..9538711 100644
--- a/include/netlink/route/act/gact.h
+++ b/include/netlink/route/act/gact.h
@@ -15,6 +15,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/route/action.h>
+#include <linux/tc_act/tc_gact.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/act/mirred.h b/include/netlink/route/act/mirred.h
index 2ed2cd8..d65ed37 100644
--- a/include/netlink/route/act/mirred.h
+++ b/include/netlink/route/act/mirred.h
@@ -15,6 +15,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/route/action.h>
+#include <linux/tc_act/tc_mirred.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/act/skbedit.h b/include/netlink/route/act/skbedit.h
index 1ff01c3..69829e8 100644
--- a/include/netlink/route/act/skbedit.h
+++ b/include/netlink/route/act/skbedit.h
@@ -15,6 +15,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/route/action.h>
+#include <linux/tc_act/tc_skbedit.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/ematch.h b/include/netlink/route/cls/ematch.h
index 728884d..13f9c32 100644
--- a/include/netlink/route/cls/ematch.h
+++ b/include/netlink/route/cls/ematch.h
@@ -15,6 +15,7 @@
 #include <netlink/netlink.h>
 #include <netlink/msg.h>
 #include <netlink/route/classifier.h>
+#include <linux/pkt_cls.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/ematch/cmp.h b/include/netlink/route/cls/ematch/cmp.h
index 0ae3851..7afb792 100644
--- a/include/netlink/route/cls/ematch/cmp.h
+++ b/include/netlink/route/cls/ematch/cmp.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
+#include <linux/tc_ematch/tc_em_cmp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/ematch/meta.h b/include/netlink/route/cls/ematch/meta.h
index 7c397c8..2fe5899 100644
--- a/include/netlink/route/cls/ematch/meta.h
+++ b/include/netlink/route/cls/ematch/meta.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
+#include <linux/tc_ematch/tc_em_meta.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/ematch/nbyte.h b/include/netlink/route/cls/ematch/nbyte.h
index 25b07d9..014c719 100644
--- a/include/netlink/route/cls/ematch/nbyte.h
+++ b/include/netlink/route/cls/ematch/nbyte.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
+#include <linux/tc_ematch/tc_em_nbyte.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/cls/ematch/text.h b/include/netlink/route/cls/ematch/text.h
index 190ce8e..e599abf 100644
--- a/include/netlink/route/cls/ematch/text.h
+++ b/include/netlink/route/cls/ematch/text.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
+#include <linux/tc_ematch/tc_em_text.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/link/can.h b/include/netlink/route/link/can.h
index 442cd8d..1979a71 100644
--- a/include/netlink/route/link/can.h
+++ b/include/netlink/route/link/can.h
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
+#include <linux/can/netlink.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/link/macsec.h b/include/netlink/route/link/macsec.h
index 58ff7b6..ace4de2 100644
--- a/include/netlink/route/link/macsec.h
+++ b/include/netlink/route/link/macsec.h
@@ -14,6 +14,8 @@
 
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
+#include <linux/if_link.h>
+#include <linux/if_macsec.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/pktloc.h b/include/netlink/route/pktloc.h
index a54659a..c3768ce 100644
--- a/include/netlink/route/pktloc.h
+++ b/include/netlink/route/pktloc.h
@@ -16,6 +16,7 @@
 #include <netlink/cache.h>
 #include <netlink/route/tc.h>
 
+#include <linux/tc_ematch/tc_em_cmp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/route.h b/include/netlink/route/route.h
index 80e6bc9..477250d 100644
--- a/include/netlink/route/route.h
+++ b/include/netlink/route/route.h
@@ -18,6 +18,7 @@
 #include <netlink/data.h>
 #include <netlink/route/nexthop.h>
 #include <netlink/route/rtnl.h>
+#include <linux/in_route.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/rule.h b/include/netlink/route/rule.h
index 450c5a9..760b782 100644
--- a/include/netlink/route/rule.h
+++ b/include/netlink/route/rule.h
@@ -16,6 +16,7 @@
 #include <netlink/cache.h>
 #include <netlink/addr.h>
 #include <netlink/route/route.h>
+#include <linux/fib_rules.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/tc.h b/include/netlink/route/tc.h
index 266f48d..f1f0f8d 100644
--- a/include/netlink/route/tc.h
+++ b/include/netlink/route/tc.h
@@ -16,6 +16,8 @@
 #include <netlink/cache.h>
 #include <netlink/data.h>
 #include <netlink/route/link.h>
+#include <linux/pkt_sched.h>
+#include <linux/pkt_cls.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/xfrm/ae.h b/include/netlink/xfrm/ae.h
index 558474a..95112dd 100644
--- a/include/netlink/xfrm/ae.h
+++ b/include/netlink/xfrm/ae.h
@@ -37,6 +37,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/addr.h>
+#include <linux/xfrm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/xfrm/lifetime.h b/include/netlink/xfrm/lifetime.h
index cb9fdc5..a5d5955 100644
--- a/include/netlink/xfrm/lifetime.h
+++ b/include/netlink/xfrm/lifetime.h
@@ -37,6 +37,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/addr.h>
+#include <linux/xfrm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/xfrm/sa.h b/include/netlink/xfrm/sa.h
index e2e54e2..7362c36 100644
--- a/include/netlink/xfrm/sa.h
+++ b/include/netlink/xfrm/sa.h
@@ -37,6 +37,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/addr.h>
+#include <linux/xfrm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/xfrm/selector.h b/include/netlink/xfrm/selector.h
index 3e3ec5a..2ee6842 100644
--- a/include/netlink/xfrm/selector.h
+++ b/include/netlink/xfrm/selector.h
@@ -37,6 +37,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/addr.h>
+#include <linux/xfrm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/xfrm/sp.h b/include/netlink/xfrm/sp.h
index 053c4de..84cbfb2 100644
--- a/include/netlink/xfrm/sp.h
+++ b/include/netlink/xfrm/sp.h
@@ -39,6 +39,7 @@
 #include <netlink/addr.h>
 #include <netlink/xfrm/template.h>
 #include <netlink/xfrm/lifetime.h>
+#include <linux/xfrm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/xfrm/template.h b/include/netlink/xfrm/template.h
index ac7189c..da51e7d 100644
--- a/include/netlink/xfrm/template.h
+++ b/include/netlink/xfrm/template.h
@@ -37,6 +37,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/addr.h>
+#include <linux/xfrm.h>
 
 #ifdef __cplusplus
 extern "C" {