include: don't include kernel headers in public libnl3 headers

It would be desirable not to include kernel headers in our public
libnl3 headers. As a test, remove all those includes, and fix
compilation by explicitly including the kernel headers where needed.
In some cases, that requires forward declaration for kernel
structures, as we use them as part of our own headers.

Realistically, we cannot drop those includes as it probalby breaks
compilation for users that expect to get a certain kernel header
when including a libnl3 header. So, this will not be done and the
includes will be restored in the next commit.

Do this step to show how it would be and to verify that we could
build with such a change. The reason not to do this is backward
compatibility (at compile-time).

42 files changed, 86 insertions, 2 deletions

diff --git a/src/genl-ctrl-list.c b/src/genl-ctrl-list.c
index 078c30c7..e6d09c35 100644
--- a/src/genl-ctrl-list.c
+++ b/src/genl-ctrl-list.c
@@ -11,6 +11,8 @@
 
 #include <netlink/cli/utils.h>
 
+#include <linux/genetlink.h>
+
 static struct nl_cache *alloc_genl_family_cache(struct nl_sock *sk)
 {
 	return nl_cli_alloc_cache(sk, "generic netlink family",
diff --git a/src/nf-ct-add.c b/src/nf-ct-add.c
index 8ad4c534..fa988acf 100644
--- a/src/nf-ct-add.c
+++ b/src/nf-ct-add.c
@@ -14,6 +14,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/ct.h>
 
+#include <linux/rtnetlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nf-ct-list.c b/src/nf-ct-list.c
index bc6a3375..6355d108 100644
--- a/src/nf-ct-list.c
+++ b/src/nf-ct-list.c
@@ -14,6 +14,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/ct.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nf-exp-add.c b/src/nf-exp-add.c
index a81147e8..68e2ec6d 100644
--- a/src/nf-exp-add.c
+++ b/src/nf-exp-add.c
@@ -16,6 +16,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/exp.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nf-exp-delete.c b/src/nf-exp-delete.c
index 0965e90b..43493d55 100644
--- a/src/nf-exp-delete.c
+++ b/src/nf-exp-delete.c
@@ -15,6 +15,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/exp.h>
 
+#include <linux/rtnetlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nf-exp-list.c b/src/nf-exp-list.c
index 7f5624d1..d14b1fa5 100644
--- a/src/nf-exp-list.c
+++ b/src/nf-exp-list.c
@@ -15,6 +15,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/exp.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nf-log.c b/src/nf-log.c
index 1e2c1e48..c0fd9788 100644
--- a/src/nf-log.c
+++ b/src/nf-log.c
@@ -13,10 +13,12 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
-#include <linux/netfilter/nfnetlink_log.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log.h>
 
+#include <linux/netfilter/nfnetlink_log.h>
+#include <linux/netlink.h>
+
 static struct nfnl_log *alloc_log(void)
 {
 	struct nfnl_log *log;
diff --git a/src/nf-monitor.c b/src/nf-monitor.c
index fe99af48..0b74473e 100644
--- a/src/nf-monitor.c
+++ b/src/nf-monitor.c
@@ -14,6 +14,9 @@
 #include <netlink/cli/utils.h>
 #include <netlink/netfilter/nfnl.h>
 
+#include <linux/netlink.h>
+#include <linux/netfilter/nfnetlink.h>
+
 static void obj_input(struct nl_object *obj, void *arg)
 {
 	struct nl_dump_params dp = {
diff --git a/src/nf-queue.c b/src/nf-queue.c
index b043c80e..de069b04 100644
--- a/src/nf-queue.c
+++ b/src/nf-queue.c
@@ -20,6 +20,8 @@
 #include <netlink/netfilter/queue.h>
 #include <netlink/netfilter/queue_msg.h>
 
+#include <linux/netlink.h>
+
 static struct nl_sock *nf_sock;
 
 static struct nfnl_queue *alloc_queue(void)
diff --git a/src/nl-addr-add.c b/src/nl-addr-add.c
index 19d07b3a..0467f676 100644
--- a/src/nl-addr-add.c
+++ b/src/nl-addr-add.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/addr.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nl-addr-delete.c b/src/nl-addr-delete.c
index 981930ff..0f3ae2f9 100644
--- a/src/nl-addr-delete.c
+++ b/src/nl-addr-delete.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/addr.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static struct nl_sock *sock;
 static int interactive = 0, default_yes = 0, quiet = 0;
 static int deleted = 0;
diff --git a/src/nl-addr-list.c b/src/nl-addr-list.c
index 20995a84..f9e40801 100644
--- a/src/nl-addr-list.c
+++ b/src/nl-addr-list.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/addr.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-class-add.c b/src/nl-class-add.c
index 45934713..bbba6197 100644
--- a/src/nl-class-add.c
+++ b/src/nl-class-add.c
@@ -17,6 +17,8 @@
 
 #include <netlink-private/route/tc-api.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nl-class-delete.c b/src/nl-class-delete.c
index e4be2c07..4570258b 100644
--- a/src/nl-class-delete.c
+++ b/src/nl-class-delete.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/class.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0, default_yes = 0, deleted = 0, interactive = 0;
 static struct nl_sock *sock;
 
diff --git a/src/nl-class-list.c b/src/nl-class-list.c
index e8cc71a4..4cace9a5 100644
--- a/src/nl-class-list.c
+++ b/src/nl-class-list.c
@@ -14,6 +14,8 @@
 #include <netlink/cli/class.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static struct nl_sock *sock;
 
 static struct nl_dump_params params = {
diff --git a/src/nl-classid-lookup.c b/src/nl-classid-lookup.c
index 1493ebff..b633ab66 100644
--- a/src/nl-classid-lookup.c
+++ b/src/nl-classid-lookup.c
@@ -10,6 +10,7 @@
  */
 
 #include <netlink/cli/utils.h>
+#include <linux/pkt_sched.h>
 
 static void print_usage(void)
 {
diff --git a/src/nl-cls-add.c b/src/nl-cls-add.c
index 6ac85900..e4a080a3 100644
--- a/src/nl-cls-add.c
+++ b/src/nl-cls-add.c
@@ -15,6 +15,8 @@
 
 #include <netlink-private/route/tc-api.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nl-cls-delete.c b/src/nl-cls-delete.c
index 78b93ecf..32979926 100644
--- a/src/nl-cls-delete.c
+++ b/src/nl-cls-delete.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/cls.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0, default_yes = 0, deleted = 0, interactive = 0;
 static struct nl_sock *sock;
 
diff --git a/src/nl-cls-list.c b/src/nl-cls-list.c
index 08956e09..2ab3d12c 100644
--- a/src/nl-cls-list.c
+++ b/src/nl-cls-list.c
@@ -14,6 +14,8 @@
 #include <netlink/cli/cls.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static struct nl_sock *sock;
 
 static struct nl_dump_params params = {
diff --git a/src/nl-fib-lookup.c b/src/nl-fib-lookup.c
index 705cf329..95e6acd8 100644
--- a/src/nl-fib-lookup.c
+++ b/src/nl-fib-lookup.c
@@ -11,6 +11,8 @@
 
 #include <netlink/cli/utils.h>
 
+#include <linux/rtnetlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-link-enslave.c b/src/nl-link-enslave.c
index 2b5d47db..1a75939d 100644
--- a/src/nl-link-enslave.c
+++ b/src/nl-link-enslave.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/link.h>
 #include <netlink/route/link/bonding.h>
 
+#include <linux/netlink.h>
+
 int main(int argc, char *argv[])
 {
 	struct nl_sock *sock;
diff --git a/src/nl-link-ifindex2name.c b/src/nl-link-ifindex2name.c
index 68e5158a..c4ed827b 100644
--- a/src/nl-link-ifindex2name.c
+++ b/src/nl-link-ifindex2name.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf("Usage: nl-link-ifindex2name <ifindex>\n");
diff --git a/src/nl-link-list.c b/src/nl-link-list.c
index b5c98b40..47d5c06e 100644
--- a/src/nl-link-list.c
+++ b/src/nl-link-list.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-link-name2ifindex.c b/src/nl-link-name2ifindex.c
index b8ae4bcd..1be1d18a 100644
--- a/src/nl-link-name2ifindex.c
+++ b/src/nl-link-name2ifindex.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf("Usage: nl-link-name2ifindex <name>\n");
diff --git a/src/nl-link-release.c b/src/nl-link-release.c
index 4c9f15a5..6f9de0e4 100644
--- a/src/nl-link-release.c
+++ b/src/nl-link-release.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/link.h>
 #include <netlink/route/link/bonding.h>
 
+#include <linux/netlink.h>
+
 int main(int argc, char *argv[])
 {
 	struct nl_sock *sock;
diff --git a/src/nl-link-set.c b/src/nl-link-set.c
index 6a6bac8d..a3ff8a13 100644
--- a/src/nl-link-set.c
+++ b/src/nl-link-set.c
@@ -9,10 +9,12 @@
  * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <linux/if.h>
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/if.h>
+#include <linux/netlink.h>
+
 static struct nl_sock *sock;
 static int quiet = 0;
 
diff --git a/src/nl-link-stats.c b/src/nl-link-stats.c
index 9bb11c87..82132f85 100644
--- a/src/nl-link-stats.c
+++ b/src/nl-link-stats.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-monitor.c b/src/nl-monitor.c
index 16ecac00..754f8dca 100644
--- a/src/nl-monitor.c
+++ b/src/nl-monitor.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/rtnetlink.h>
+
 static void obj_input(struct nl_object *obj, void *arg)
 {
 	struct nl_dump_params dp = {
diff --git a/src/nl-neigh-add.c b/src/nl-neigh-add.c
index 09cef9aa..d98330b6 100644
--- a/src/nl-neigh-add.c
+++ b/src/nl-neigh-add.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/neigh.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nl-neigh-delete.c b/src/nl-neigh-delete.c
index b6be44c9..2d3be37c 100644
--- a/src/nl-neigh-delete.c
+++ b/src/nl-neigh-delete.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/neigh.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0, default_yes = 0, deleted = 0, interactive = 0;
 static struct nl_sock *sock;
 
diff --git a/src/nl-neigh-list.c b/src/nl-neigh-list.c
index c99d237f..ba4ade8b 100644
--- a/src/nl-neigh-list.c
+++ b/src/nl-neigh-list.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/neigh.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-neightbl-list.c b/src/nl-neightbl-list.c
index 2380e015..5c28e910 100644
--- a/src/nl-neightbl-list.c
+++ b/src/nl-neightbl-list.c
@@ -12,6 +12,8 @@
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-pktloc-lookup.c b/src/nl-pktloc-lookup.c
index 7d244021..68dbdf92 100644
--- a/src/nl-pktloc-lookup.c
+++ b/src/nl-pktloc-lookup.c
@@ -11,6 +11,7 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/route/pktloc.h>
+#include <linux/tc_ematch/tc_em_cmp.h>
 
 static void print_usage(void)
 {
diff --git a/src/nl-qdisc-add.c b/src/nl-qdisc-add.c
index d8a1f73e..dc0b4f1d 100644
--- a/src/nl-qdisc-add.c
+++ b/src/nl-qdisc-add.c
@@ -16,6 +16,8 @@
 
 #include <netlink-private/route/tc-api.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nl-qdisc-delete.c b/src/nl-qdisc-delete.c
index c4acbfe5..4a63a7e5 100644
--- a/src/nl-qdisc-delete.c
+++ b/src/nl-qdisc-delete.c
@@ -14,6 +14,8 @@
 #include <netlink/cli/qdisc.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0, default_yes = 0, deleted = 0, interactive = 0;
 static struct nl_sock *sock;
 
diff --git a/src/nl-qdisc-list.c b/src/nl-qdisc-list.c
index b8110f1b..eb73e5fd 100644
--- a/src/nl-qdisc-list.c
+++ b/src/nl-qdisc-list.c
@@ -16,6 +16,9 @@
 #include <netlink/cli/cls.h>
 #include <netlink/cli/link.h>
 
+#include <linux/pkt_sched.h>
+#include <linux/netlink.h>
+
 #define NUM_INDENT 4
 
 static struct nl_sock *sock;
diff --git a/src/nl-route-add.c b/src/nl-route-add.c
index d4aa767e..3a2dd61b 100644
--- a/src/nl-route-add.c
+++ b/src/nl-route-add.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/route.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int quiet = 0;
 static struct nl_cache *link_cache, *route_cache;
 
diff --git a/src/nl-route-delete.c b/src/nl-route-delete.c
index 884fd7fc..56d52eb7 100644
--- a/src/nl-route-delete.c
+++ b/src/nl-route-delete.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/route.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static int interactive = 0, default_yes = 0, quiet = 0;
 static int deleted = 0;
 static struct nl_sock *sock;
diff --git a/src/nl-route-get.c b/src/nl-route-get.c
index 1ee47e47..b031ae4a 100644
--- a/src/nl-route-get.c
+++ b/src/nl-route-get.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/route.h>
 #include <netlink/cli/link.h>
 
+#include <linux/rtnetlink.h>
+
 static void print_usage(void)
 {
 	printf("Usage: nl-route-get <addr>\n");
diff --git a/src/nl-route-list.c b/src/nl-route-list.c
index e0e57be2..06ef01a6 100644
--- a/src/nl-route-list.c
+++ b/src/nl-route-list.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/route.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-rule-list.c b/src/nl-rule-list.c
index 7c450e24..ec73aca3 100644
--- a/src/nl-rule-list.c
+++ b/src/nl-rule-list.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/rule.h>
 #include <netlink/cli/link.h>
 
+#include <linux/netlink.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-tctree-list.c b/src/nl-tctree-list.c
index d90cb28f..7c3b7e60 100644
--- a/src/nl-tctree-list.c
+++ b/src/nl-tctree-list.c
@@ -13,6 +13,8 @@
 #include <netlink/cli/link.h>
 #include <netlink/cli/qdisc.h>
 #include <netlink/cli/class.h>
+
+#include <linux/netlink.h>
 #include <linux/pkt_sched.h>
 
 static struct nl_sock *sock;