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.

diff --git a/include/netlink/cli/ct.h b/include/netlink/cli/ct.h
index 518d63e6270b629bc114f26eda07023918274bb4..ebe7c9dc879c640db55fefae7b0956be5cbd931d 100644 (file)
--- 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 27440dd4105056743604b7642d79a21b14976a58..b2418f8d31a7d94e1a23a45cdcc3638af43c54ce 100644 (file)
--- 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 d5419558f18ba4cc62d11a28f9be4e1cc38f850a..b69cbf1714ef22bb9c86ea280f8f97beb3f1ed17 100644 (file)
--- 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 8a8a13e228d550ebd34757570b05a8a6fee9978b..736af24e1c13b07e84d98d884e5d17cbb34c2e2c 100644 (file)
--- 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 08f366e15fa2c6c198f31f650edb9ad81e0c4e21..41d48c68b2f974179adfb7425cb776b89ef9a7de 100644 (file)
--- 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 7ea138ab6bc349e22d34517300ffc0d1902446c5..9538711bf1c59497cb1e68c1a92f25cbd7294137 100644 (file)
--- 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 2ed2cd8b57e1be01696df0e5260f5b24b5f45fec..d65ed3788be615ed44fb24d203ef2a03c44d0385 100644 (file)
--- 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 1ff01c3c684ff54f3c1c05f482a415c2206fc6a7..69829e83cc17d189219b2e3560cab2ec310ee5aa 100644 (file)
--- 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 728884def4bb9ba5f2cf2a3854053cf18547f131..13f9c323dfc71c80a5029f77850fabe2850b2629 100644 (file)
--- 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 0ae3851171c0d28aeea83c68952f5b5b254c540d..7afb7923063d3398f096af5dd6bc01442f102a9e 100644 (file)
--- 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 7c397c836030480a90d275f48471e931b6370df0..2fe58990431f48145139bd85bd360847410223b6 100644 (file)
--- 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 25b07d9d01c531ef223af48fcc6d5ee18d90f77e..014c719b1ccc9ce894392a329617b941f1c70322 100644 (file)
--- 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 190ce8e17ca1b9fdbf1a93a4ac6aac41b0dd0f67..e599abf05dff191af4a098bba5c44d716850fc59 100644 (file)
--- 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 442cd8d88e20858eb5d61f4b5a82cdddc841fa7b..1979a714cba787d818bba2b3d650234fce64d2c5 100644 (file)
--- 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 58ff7b6e1fec81bb82a3c4e5035f5a3556326ec0..ace4de2de1be68f0764e135b2edf11277d3a5d08 100644 (file)
--- 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 a54659aef80af945c5267075d80090098353b8fd..c3768ce96ddddf1e48f3b0ba202cf94a1c11b5db 100644 (file)
--- 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 80e6bc98e5c0806537680d0ed7f2efe030d162f5..477250dd8258ec90a102b5e076bd1afeb41326e3 100644 (file)
--- 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 450c5a98f27c1d82ae115dc60b8edf6527b1c627..760b782ad09efd110b631acae35c5318da68367f 100644 (file)
--- 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 266f48d4315ebd9989f9952855729d595057c9a4..f1f0f8d16b770484c3569119d8cb63a46f7cc127 100644 (file)
--- 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 558474ac85d228c97939e9b7e097ef1c12ef6363..95112dd5b3aeae88adeb82c41bdb2cacf65047eb 100644 (file)
--- 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 cb9fdc5f5e4d8b1cdf421050f47a2e19d518dbcd..a5d5955da07aecee6a9f7b7cdb90eb99d40046d5 100644 (file)
--- 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 e2e54e2b0cda1f610917c9e15f7f84001414bae0..7362c36120ac359852f1251f92de61fec12424f0 100644 (file)
--- 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 3e3ec5ab57dd932e9f3debc753739edb1d3b72c0..2ee6842a2e28999c065c387e39b014079197afe6 100644 (file)
--- 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 053c4de6b6899f6d0aaa061bd12a895674b9a5aa..84cbfb26867391999c7c63a11c64447976942105 100644 (file)
--- 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 ac7189c50e76dd796b73f0dfd3a15893c755f334..da51e7d8ec9755173658568357e4ab0e647a34d7 100644 (file)
--- 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" {