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 518d63e6..ebe7c9dc 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 27440dd4..b2418f8d 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 d5419558..b69cbf17 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 8a8a13e2..736af24e 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 08f366e1..41d48c68 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 7ea138ab..9538711b 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 2ed2cd8b..d65ed378 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 1ff01c3c..69829e83 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 728884de..13f9c323 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 0ae38511..7afb7923 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 7c397c83..2fe58990 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 25b07d9d..014c719b 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 190ce8e1..e599abf0 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 442cd8d8..1979a714 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 58ff7b6e..ace4de2d 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 a54659ae..c3768ce9 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 80e6bc98..477250dd 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 450c5a98..760b782a 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 266f48d4..f1f0f8d1 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 558474ac..95112dd5 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 cb9fdc5f..a5d5955d 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 e2e54e2b..7362c361 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 3e3ec5ab..2ee6842a 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 053c4de6..84cbfb26 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 ac7189c5..da51e7d8 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" {