all: cleanup includes and use "nm-default.h"

235 files changed, 985 insertions, 350 deletions

diff --git a/lib/addr.c b/lib/addr.c
index f1a6fb6..0d54a80 100644
--- a/lib/addr.c
+++ b/lib/addr.c
@@ -21,11 +21,15 @@
  * ~~~~
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/socket.h>
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/addr.h>
-#include <linux/socket.h>
+
+#include <netlink-private/netlink.h>
 
 #include "mpls.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/attr.c b/lib/attr.c
index 4151d69..f030527 100644
--- a/lib/attr.c
+++ b/lib/attr.c
@@ -3,13 +3,17 @@
  * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/socket.h>
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/addr.h>
 #include <netlink/attr.h>
 #include <netlink/msg.h>
-#include <linux/socket.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/cache.c b/lib/cache.c
index 0df5839..b62ca58 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -43,14 +43,16 @@
  * ~~~~
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/object.h>
 #include <netlink/hashtable.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-priv-dynamic-core/nl-core.h"
 #include "nl-priv-dynamic-core/object-api.h"
 
diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c
index eb6b287..4323f38 100644
--- a/lib/cache_mngr.c
+++ b/lib/cache_mngr.c
@@ -26,12 +26,14 @@
  * ~~~~
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-priv-dynamic-core/nl-core.h"
 
 /** @cond SKIP */
diff --git a/lib/cache_mngt.c b/lib/cache_mngt.c
index 574ec72..20971d9 100644
--- a/lib/cache_mngt.c
+++ b/lib/cache_mngt.c
@@ -19,6 +19,8 @@
  * ~~~~
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
diff --git a/lib/cli/cls/basic.c b/lib/cli/cls/basic.c
index 7143e67..5d33e89 100644
--- a/lib/cli/cls/basic.c
+++ b/lib/cli/cls/basic.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2010-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/cli/cls.h>
diff --git a/lib/cli/cls/cgroup.c b/lib/cli/cls/cgroup.c
index 8aff2e9..296df69 100644
--- a/lib/cli/cls/cgroup.c
+++ b/lib/cli/cls/cgroup.c
@@ -3,13 +3,13 @@
  * Copyright (c) 2010-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/cli/cls.h>
 #include <netlink/route/cls/cgroup.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/bfifo.c b/lib/cli/qdisc/bfifo.c
index b282cf2..30db045 100644
--- a/lib/cli/qdisc/bfifo.c
+++ b/lib/cli/qdisc/bfifo.c
@@ -3,12 +3,12 @@
  * Copyright (c) 2010-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/fifo.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/blackhole.c b/lib/cli/qdisc/blackhole.c
index 8860b1d..0ae0a53 100644
--- a/lib/cli/qdisc/blackhole.c
+++ b/lib/cli/qdisc/blackhole.c
@@ -3,11 +3,11 @@
  * Copyright (c) 2010-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/fq_codel.c b/lib/cli/qdisc/fq_codel.c
index 3f9cc7e..83e409a 100644
--- a/lib/cli/qdisc/fq_codel.c
+++ b/lib/cli/qdisc/fq_codel.c
@@ -3,12 +3,12 @@
  * Copyright (c) 2013 Cong Wang <xiyou.wangcong@gmail.com>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/fq_codel.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/hfsc.c b/lib/cli/qdisc/hfsc.c
index 22b1ede..9ab7f7e 100644
--- a/lib/cli/qdisc/hfsc.c
+++ b/lib/cli/qdisc/hfsc.c
@@ -3,12 +3,13 @@
  * Copyright (c) 2014 Cong Wang <xiyou.wangcong@gmail.com>
  */
 
+#include "nl-default.h"
+
+#include <linux/pkt_sched.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/hfsc.h>
-#include <linux/pkt_sched.h>
-
-#include "base/nl-base-utils.h"
 
 static void print_qdisc_usage(void)
 {
diff --git a/lib/cli/qdisc/htb.c b/lib/cli/qdisc/htb.c
index ce01554..5ca6ae5 100644
--- a/lib/cli/qdisc/htb.c
+++ b/lib/cli/qdisc/htb.c
@@ -3,12 +3,12 @@
  * Copyright (c) 2010-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/htb.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_qdisc_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/ingress.c b/lib/cli/qdisc/ingress.c
index 46fbde0..9c09c4f 100644
--- a/lib/cli/qdisc/ingress.c
+++ b/lib/cli/qdisc/ingress.c
@@ -3,11 +3,11 @@
  * Copyright (c) 2013 Cong Wang <xiyou.wangcong@gmail.com>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/pfifo.c b/lib/cli/qdisc/pfifo.c
index 49a4c35..fbaa872 100644
--- a/lib/cli/qdisc/pfifo.c
+++ b/lib/cli/qdisc/pfifo.c
@@ -3,12 +3,12 @@
  * Copyright (c) 2010-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/fifo.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/cli/qdisc/plug.c b/lib/cli/qdisc/plug.c
index b0ca6b9..212a6cf 100644
--- a/lib/cli/qdisc/plug.c
+++ b/lib/cli/qdisc/plug.c
@@ -3,12 +3,12 @@
  * Copyright (c) 2012 Shriram Rajagopalan <rshriram@cs.ubc.ca>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/route/qdisc/plug.h>
 
-#include "base/nl-base-utils.h"
-
 static void print_usage(void)
 {
 	printf(
diff --git a/lib/data.c b/lib/data.c
index dcfd2a2..83b114e 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -21,10 +21,14 @@
  * ~~~~
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/socket.h>
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <linux/socket.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/error.c b/lib/error.c
index bd0b92d..d1a448a 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -3,9 +3,12 @@
  * Copyright (c) 2008 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 
+#include <netlink-private/netlink.h>
+
 static const char *errmsg[NLE_MAX+1] = {
 [NLE_SUCCESS]		= "Success",
 [NLE_FAILURE]		= "Unspecific failure",
diff --git a/lib/fib_lookup/lookup.c b/lib/fib_lookup/lookup.c
index 35913bb..ca0933c 100644
--- a/lib/fib_lookup/lookup.c
+++ b/lib/fib_lookup/lookup.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -21,7 +23,6 @@
 
 #include <netlink-private/netlink.h>
 
-#include "base/nl-base-utils.h"
 #include "nl-priv-dynamic-core/object-api.h"
 
 /** @cond SKIP */
diff --git a/lib/fib_lookup/request.c b/lib/fib_lookup/request.c
index 6b35287..f61fdd2 100644
--- a/lib/fib_lookup/request.c
+++ b/lib/fib_lookup/request.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
diff --git a/lib/genl/ctrl.c b/lib/genl/ctrl.c
index c8e7450..a4ae3d1 100644
--- a/lib/genl/ctrl.c
+++ b/lib/genl/ctrl.c
@@ -15,6 +15,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
diff --git a/lib/genl/family.c b/lib/genl/family.c
index 9496d03..ac648e5 100644
--- a/lib/genl/family.c
+++ b/lib/genl/family.c
@@ -12,13 +12,14 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
 #include <netlink/utils.h>
 
 #include "nl-genl.h"
-#include "base/nl-base-utils.h"
 #include "nl-priv-dynamic-core/object-api.h"
 
 /** @cond SKIP */
diff --git a/lib/genl/genl.c b/lib/genl/genl.c
index d2b0c30..769c1e3 100644
--- a/lib/genl/genl.c
+++ b/lib/genl/genl.c
@@ -9,11 +9,14 @@
  * @{
  */
 
-#include "nl-genl.h"
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/utils.h>
 
+#include "nl-genl.h"
+
 /**
  * @name Generic Netlink Socket
  * @{
diff --git a/lib/genl/mngt.c b/lib/genl/mngt.c
index b3e633d..e55256c 100644
--- a/lib/genl/mngt.c
+++ b/lib/genl/mngt.c
@@ -12,7 +12,8 @@
  * @{
  */
 
-#include "nl-genl.h"
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/mngt.h>
@@ -20,7 +21,7 @@
 #include <netlink/genl/ctrl.h>
 #include <netlink/utils.h>
 
-#include "base/nl-base-utils.h"
+#include "nl-genl.h"
 
 /** @cond SKIP */
 
diff --git a/lib/handlers.c b/lib/handlers.c
index e869645..d921b3f 100644
--- a/lib/handlers.c
+++ b/lib/handlers.c
@@ -19,13 +19,15 @@
  * ~~~~
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/msg.h>
 #include <netlink/handlers.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-core.h"
 
 static void print_header_content(FILE *ofd, struct nlmsghdr *n)
diff --git a/lib/hash.c b/lib/hash.c
index 17b5c8f..94a73f8 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -39,6 +39,8 @@ mixing with 12*3 instructions on 3 integers than you can with 3 instructions
 on 1 byte), but shoehorning those bytes into integers efficiently is messy.
 -------------------------------------------------------------------------------
 */
+#include "nl-default.h"
+
 #include <netlink/hash.h>
 
 #if HAVE_LITTLE_ENDIAN
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 1b332ba..f6d49be 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -3,12 +3,16 @@
  * Copyright (c) 2012 Cumulus Networks, Inc
  */
 
+#include "nl-default.h"
+
 #include <string.h>
-#include <netlink-private/netlink.h>
+
 #include <netlink/object.h>
 #include <netlink/hash.h>
 #include <netlink/hashtable.h>
 
+#include <netlink-private/netlink.h>
+
 /**
  * @ingroup core_types
  * @defgroup hashtable Hashtable
diff --git a/lib/idiag/idiag.c b/lib/idiag/idiag.c
index 38c3a6b..69a650e 100644
--- a/lib/idiag/idiag.c
+++ b/lib/idiag/idiag.c
@@ -9,11 +9,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/inet_diag.h>
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/idiag/idiagnl.h>
-#include <linux/inet_diag.h>
+
+#include <netlink-private/netlink.h>
 
 /**
  * @name Socket Creation
diff --git a/lib/idiag/idiag_meminfo_obj.c b/lib/idiag/idiag_meminfo_obj.c
index aa84a60..795f3be 100644
--- a/lib/idiag/idiag_meminfo_obj.c
+++ b/lib/idiag/idiag_meminfo_obj.c
@@ -3,9 +3,12 @@
  * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/idiag/meminfo.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-idiag.h"
 
 /**
diff --git a/lib/idiag/idiag_msg_obj.c b/lib/idiag/idiag_msg_obj.c
index fbf0450..003ffd4 100644
--- a/lib/idiag/idiag_msg_obj.c
+++ b/lib/idiag/idiag_msg_obj.c
@@ -3,15 +3,18 @@
  * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
  */
 
+#include "nl-default.h"
+
 #include <linux/inet_diag.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/hashtable.h>
 #include <netlink/idiag/msg.h>
 #include <netlink/idiag/meminfo.h>
 #include <netlink/idiag/vegasinfo.h>
 #include <netlink/idiag/idiagnl.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-idiag.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/idiag/idiag_req_obj.c b/lib/idiag/idiag_req_obj.c
index 6e049c1..9a89ace 100644
--- a/lib/idiag/idiag_req_obj.c
+++ b/lib/idiag/idiag_req_obj.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
  */
 
+#include "nl-default.h"
+
 #include <linux/inet_diag.h>
 
 #include <netlink/idiag/req.h>
diff --git a/lib/idiag/idiag_vegasinfo_obj.c b/lib/idiag/idiag_vegasinfo_obj.c
index 5f4ecec..0104eb5 100644
--- a/lib/idiag/idiag_vegasinfo_obj.c
+++ b/lib/idiag/idiag_vegasinfo_obj.c
@@ -3,9 +3,12 @@
  * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/idiag/vegasinfo.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-idiag.h"
 
 /**
diff --git a/lib/mpls.c b/lib/mpls.c
index 94648ed..0591b17 100644
--- a/lib/mpls.c
+++ b/lib/mpls.c
@@ -3,13 +3,18 @@
  * Adapted from mpls_ntop and mpls_pton copied from iproute2,
  * lib/mpls_ntop.c and lib/mpls_pton.c
  */
+
+#include "nl-default.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <netinet/in.h>
-#include <netlink/netlink-compat.h>
+
 #include <linux-private/linux/mpls.h>
 
+#include <netlink/netlink-compat.h>
+
 #include "mpls.h"
 
 static const char *mpls_ntop1(const struct mpls_label *addr,
diff --git a/lib/msg.c b/lib/msg.c
index 8cd0c81..8f7259d 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -20,13 +20,16 @@
  * ~~~~
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
+#include <linux/socket.h>
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/cache.h>
 #include <netlink/attr.h>
-#include <linux/socket.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/netfilter/ct.c b/lib/netfilter/ct.c
index f57bb3a..5552a82 100644
--- a/lib/netfilter/ct.c
+++ b/lib/netfilter/ct.c
@@ -13,15 +13,18 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <byteswap.h>
 #include <sys/types.h>
+
 #include <linux/netfilter/nfnetlink_conntrack.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/ct.h>
-#include "base/nl-base-utils.h"
+
+#include <netlink-private/netlink.h>
 
 #include "nl-netfilter.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/netfilter/ct_obj.c b/lib/netfilter/ct_obj.c
index 8fb4691..4fdab31 100644
--- a/lib/netfilter/ct_obj.c
+++ b/lib/netfilter/ct_obj.c
@@ -5,6 +5,8 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
+#include "nl-default.h"
+
 #include <sys/types.h>
 
 #include <linux/netfilter/nfnetlink_conntrack.h>
diff --git a/lib/netfilter/exp.c b/lib/netfilter/exp.c
index fc791ba..b5637af 100644
--- a/lib/netfilter/exp.c
+++ b/lib/netfilter/exp.c
@@ -14,15 +14,19 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <byteswap.h>
 #include <sys/types.h>
+
 #include <linux/netfilter/nfnetlink_conntrack.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/exp.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-netfilter.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/netfilter/exp_obj.c b/lib/netfilter/exp_obj.c
index 1a1364f..cd9b4d6 100644
--- a/lib/netfilter/exp_obj.c
+++ b/lib/netfilter/exp_obj.c
@@ -6,6 +6,8 @@
  * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
  */
 
+#include "nl-default.h"
+
 #include <sys/types.h>
 #include <netinet/in.h>
 
diff --git a/lib/netfilter/log.c b/lib/netfilter/log.c
index 88ca94d..c51efba 100644
--- a/lib/netfilter/log.c
+++ b/lib/netfilter/log.c
@@ -12,14 +12,17 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_log.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-priv-dynamic-core/nl-core.h"
 
 /**
diff --git a/lib/netfilter/log_msg.c b/lib/netfilter/log_msg.c
index 8539b18..558a081 100644
--- a/lib/netfilter/log_msg.c
+++ b/lib/netfilter/log_msg.c
@@ -13,16 +13,19 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <sys/types.h>
+
 #include <linux/netfilter/nfnetlink_log.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log_msg.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-netfilter.h"
-#include "base/nl-base-utils.h"
 
 static struct nla_policy log_msg_policy[NFULA_MAX+1] = {
 	[NFULA_PACKET_HDR]		= {
diff --git a/lib/netfilter/log_msg_obj.c b/lib/netfilter/log_msg_obj.c
index b1a1482..4790c02 100644
--- a/lib/netfilter/log_msg_obj.c
+++ b/lib/netfilter/log_msg_obj.c
@@ -5,6 +5,8 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
+#include "nl-default.h"
+
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/netfilter.h>
 #include <netlink/netfilter/log_msg.h>
diff --git a/lib/netfilter/log_obj.c b/lib/netfilter/log_obj.c
index 99badc0..2b74d99 100644
--- a/lib/netfilter/log_obj.c
+++ b/lib/netfilter/log_obj.c
@@ -6,6 +6,8 @@
  * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
  */
 
+#include "nl-default.h"
+
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log.h>
 
diff --git a/lib/netfilter/netfilter.c b/lib/netfilter/netfilter.c
index 616c10c..908c700 100644
--- a/lib/netfilter/netfilter.c
+++ b/lib/netfilter/netfilter.c
@@ -3,10 +3,14 @@
  * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
  */
 
-#include <netlink-private/netlink.h>
-#include <netlink/netfilter/netfilter.h>
+#include "nl-default.h"
+
 #include <linux/netfilter.h>
 
+#include <netlink/netfilter/netfilter.h>
+
+#include <netlink-private/netlink.h>
+
 static const struct trans_tbl nfnl_verdicts[] = {
 	__ADD(NF_DROP,		NF_DROP),
 	__ADD(NF_ACCEPT,	NF_ACCEPT),
diff --git a/lib/netfilter/nfnl.c b/lib/netfilter/nfnl.c
index f18e498..6311329 100644
--- a/lib/netfilter/nfnl.c
+++ b/lib/netfilter/nfnl.c
@@ -55,11 +55,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/netfilter/nfnetlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 
-#include <linux/netfilter/nfnetlink.h>
+#include <netlink-private/netlink.h>
 
 /**
  * @name Socket Creating
diff --git a/lib/netfilter/queue.c b/lib/netfilter/queue.c
index 37369c5..962f7d2 100644
--- a/lib/netfilter/queue.c
+++ b/lib/netfilter/queue.c
@@ -10,14 +10,18 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <sys/types.h>
+
 #include <linux/netfilter/nfnetlink_queue.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-priv-dynamic-core/nl-core.h"
 
 struct nl_sock *nfnl_queue_socket_alloc(void)
diff --git a/lib/netfilter/queue_msg.c b/lib/netfilter/queue_msg.c
index b7044d0..a50de92 100644
--- a/lib/netfilter/queue_msg.c
+++ b/lib/netfilter/queue_msg.c
@@ -11,14 +11,17 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <sys/types.h>
+
 #include <linux/netfilter/nfnetlink_queue.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue_msg.h>
-#include "base/nl-base-utils.h"
+
+#include <netlink-private/netlink.h>
 
 #include "nl-netfilter.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/netfilter/queue_msg_obj.c b/lib/netfilter/queue_msg_obj.c
index 50ee727..ea4e3c0 100644
--- a/lib/netfilter/queue_msg_obj.c
+++ b/lib/netfilter/queue_msg_obj.c
@@ -3,11 +3,15 @@
  * Copyright (c) 2007, 2008 Patrick McHardy <kaber@trash.net>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/netfilter.h>
+
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/netfilter.h>
 #include <netlink/netfilter/queue_msg.h>
-#include <linux/netfilter.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-netfilter.h"
 
diff --git a/lib/netfilter/queue_obj.c b/lib/netfilter/queue_obj.c
index cfe7e33..5ddb5a5 100644
--- a/lib/netfilter/queue_obj.c
+++ b/lib/netfilter/queue_obj.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue.h>
 
diff --git a/lib/nl.c b/lib/nl.c
index 84baa98..f385fb5 100644
--- a/lib/nl.c
+++ b/lib/nl.c
@@ -19,14 +19,17 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
+#include <linux/socket.h>
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/handlers.h>
 #include <netlink/msg.h>
 #include <netlink/attr.h>
-#include <linux/socket.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-core.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/object.c b/lib/object.c
index b16e138..77fd4a1 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -21,6 +21,8 @@
  * ~~~~
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/object.h>
diff --git a/lib/route/act.c b/lib/route/act.c
index 75d10cb..ea00828 100644
--- a/lib/route/act.c
+++ b/lib/route/act.c
@@ -9,6 +9,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/link.h>
@@ -16,7 +18,6 @@
 
 #include <netlink-private/netlink.h>
 
-#include "base/nl-base-utils.h"
 #include "nl-route.h"
 #include "tc-api.h"
 #include "nl-priv-dynamic-core/object-api.h"
diff --git a/lib/route/act/gact.c b/lib/route/act/gact.c
index 93154aa..6ce25a7 100644
--- a/lib/route/act/gact.c
+++ b/lib/route/act/gact.c
@@ -10,12 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/route/act/gact.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct rtnl_gact {
diff --git a/lib/route/act/mirred.c b/lib/route/act/mirred.c
index 53058aa..a857fbe 100644
--- a/lib/route/act/mirred.c
+++ b/lib/route/act/mirred.c
@@ -10,12 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/route/act/mirred.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct rtnl_mirred {
diff --git a/lib/route/act/nat.c b/lib/route/act/nat.c
index 07b9512..137bcff 100644
--- a/lib/route/act/nat.c
+++ b/lib/route/act/nat.c
@@ -10,13 +10,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/route/act/nat.h>
 #include <netlink/route/tc.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 static struct nla_policy nat_policy[TCA_NAT_MAX + 1] = {
diff --git a/lib/route/act/skbedit.c b/lib/route/act/skbedit.c
index 5e5b47a..588f053 100644
--- a/lib/route/act/skbedit.c
+++ b/lib/route/act/skbedit.c
@@ -10,12 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/route/act/skbedit.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "tc-api.h"
 
diff --git a/lib/route/act/vlan.c b/lib/route/act/vlan.c
index 8d6a7be..f86a35d 100644
--- a/lib/route/act/vlan.c
+++ b/lib/route/act/vlan.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <linux/tc_act/tc_vlan.h>
 
 #include <netlink/netlink.h>
diff --git a/lib/route/addr.c b/lib/route/addr.c
index 4d29d22..ebc0016 100644
--- a/lib/route/addr.c
+++ b/lib/route/addr.c
@@ -100,7 +100,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/addr.h>
@@ -108,6 +109,8 @@
 #include <netlink/route/link.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/route/class.c b/lib/route/class.c
index 4f3fa6e..34f0276 100644
--- a/lib/route/class.c
+++ b/lib/route/class.c
@@ -9,13 +9,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/class.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/classifier.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "tc-api.h"
 
diff --git a/lib/route/classid.c b/lib/route/classid.c
index 65c1092..2740b04 100644
--- a/lib/route/classid.c
+++ b/lib/route/classid.c
@@ -9,11 +9,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/tc.h>
 
+#include <netlink-private/netlink.h>
+
 struct classid_map
 {
 	uint32_t		classid;
diff --git a/lib/route/cls.c b/lib/route/cls.c
index a683a72..f44a55d 100644
--- a/lib/route/cls.c
+++ b/lib/route/cls.c
@@ -9,12 +9,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/link.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "tc-api.h"
 
diff --git a/lib/route/cls/basic.c b/lib/route/cls/basic.c
index 1306ca8..b1e3926 100644
--- a/lib/route/cls/basic.c
+++ b/lib/route/cls/basic.c
@@ -16,13 +16,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/action.h>
 #include <netlink/route/cls/basic.h>
 #include <netlink/route/cls/ematch.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct rtnl_basic
diff --git a/lib/route/cls/cgroup.c b/lib/route/cls/cgroup.c
index 26ac82e..cd89483 100644
--- a/lib/route/cls/cgroup.c
+++ b/lib/route/cls/cgroup.c
@@ -10,7 +10,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -18,6 +19,8 @@
 #include <netlink/route/cls/cgroup.h>
 #include <netlink/route/cls/ematch.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/cls/ematch.c b/lib/route/cls/ematch.c
index d92fadd..2527623 100644
--- a/lib/route/cls/ematch.c
+++ b/lib/route/cls/ematch.c
@@ -10,12 +10,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/tc_ematch/tc_em_cmp.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/cmp.h>
-#include <linux/tc_ematch/tc_em_cmp.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 
diff --git a/lib/route/cls/ematch/cmp.c b/lib/route/cls/ematch/cmp.c
index 12f8127..d0eb38c 100644
--- a/lib/route/cls/ematch/cmp.c
+++ b/lib/route/cls/ematch/cmp.c
@@ -10,11 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/tc_ematch/tc_em_cmp.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/cmp.h>
-#include <linux/tc_ematch/tc_em_cmp.h>
+
+#include <netlink-private/netlink.h>
 
 void rtnl_ematch_cmp_set(struct rtnl_ematch *e, struct tcf_em_cmp *cfg)
 {
diff --git a/lib/route/cls/ematch/container.c b/lib/route/cls/ematch/container.c
index 7f8eda1..71aba58 100644
--- a/lib/route/cls/ematch/container.c
+++ b/lib/route/cls/ematch/container.c
@@ -3,10 +3,13 @@
  * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 
 static int container_parse(struct rtnl_ematch *e, void *data, size_t len __attribute__((unused)))
diff --git a/lib/route/cls/ematch/meta.c b/lib/route/cls/ematch/meta.c
index f86e06f..2cfc3e8 100644
--- a/lib/route/cls/ematch/meta.c
+++ b/lib/route/cls/ematch/meta.c
@@ -10,11 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/tc_ematch/tc_em_meta.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/meta.h>
-#include <linux/tc_ematch/tc_em_meta.h>
+
+#include <netlink-private/netlink.h>
 
 struct rtnl_meta_value
 {
diff --git a/lib/route/cls/ematch/nbyte.c b/lib/route/cls/ematch/nbyte.c
index 70fdcf9..d7c6b06 100644
--- a/lib/route/cls/ematch/nbyte.c
+++ b/lib/route/cls/ematch/nbyte.c
@@ -10,11 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/tc_ematch/tc_em_nbyte.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/nbyte.h>
-#include <linux/tc_ematch/tc_em_nbyte.h>
+
+#include <netlink-private/netlink.h>
 
 struct nbyte_data
 {
diff --git a/lib/route/cls/ematch/text.c b/lib/route/cls/ematch/text.c
index e46eefe..a1fcc1b 100644
--- a/lib/route/cls/ematch/text.c
+++ b/lib/route/cls/ematch/text.c
@@ -10,12 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
+#include <linux/tc_ematch/tc_em_text.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/text.h>
-#include <linux/tc_ematch/tc_em_text.h>
+
+#include <netlink-private/netlink.h>
 
 struct text_data
 {
diff --git a/lib/route/cls/flower.c b/lib/route/cls/flower.c
index 9ad0788..ceec90a 100644
--- a/lib/route/cls/flower.c
+++ b/lib/route/cls/flower.c
@@ -3,7 +3,8 @@
  * Copyright (c) 2018 Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -11,6 +12,8 @@
 #include <netlink/route/action.h>
 #include <netlink/route/cls/flower.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/cls/fw.c b/lib/route/cls/fw.c
index 69109ef..2b91ab9 100644
--- a/lib/route/cls/fw.c
+++ b/lib/route/cls/fw.c
@@ -12,11 +12,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/fw.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/cls/mall.c b/lib/route/cls/mall.c
index ea2556d..69d700c 100644
--- a/lib/route/cls/mall.c
+++ b/lib/route/cls/mall.c
@@ -10,7 +10,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -18,6 +19,8 @@
 #include <netlink/route/cls/matchall.h>
 #include <netlink/route/action.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct rtnl_mall {
diff --git a/lib/route/cls/police.c b/lib/route/cls/police.c
index 71bf0b6..d184c16 100644
--- a/lib/route/cls/police.c
+++ b/lib/route/cls/police.c
@@ -3,12 +3,15 @@
  * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/police.h>
 
+#include <netlink-private/netlink.h>
+
 /**
  * @name Policer Type
  * @{
diff --git a/lib/route/cls/u32.c b/lib/route/cls/u32.c
index 2d7a5cb..50934f0 100644
--- a/lib/route/cls/u32.c
+++ b/lib/route/cls/u32.c
@@ -12,7 +12,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -20,6 +21,8 @@
 #include <netlink/route/cls/u32.h>
 #include <netlink/route/action.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 #include "nl-aux-route/nl-route.h"
 
diff --git a/lib/route/link.c b/lib/route/link.c
index 1905856..412ff00 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -12,7 +12,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -22,9 +23,10 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-aux-route/nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
-
 #include "nl-route.h"
 #include "link-sriov.h"
 #include "link/link-api.h"
diff --git a/lib/route/link/api.c b/lib/route/link/api.c
index c785f59..3dc0182 100644
--- a/lib/route/link/api.c
+++ b/lib/route/link/api.c
@@ -33,11 +33,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/link.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-api.h"
 
diff --git a/lib/route/link/bonding.c b/lib/route/link/bonding.c
index cb897e5..c470f06 100644
--- a/lib/route/link/bonding.c
+++ b/lib/route/link/bonding.c
@@ -14,10 +14,13 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/link/bonding.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-api.h"
 
diff --git a/lib/route/link/bridge.c b/lib/route/link/bridge.c
index 2d035f7..cec5f33 100644
--- a/lib/route/link/bridge.c
+++ b/lib/route/link/bridge.c
@@ -11,12 +11,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_bridge.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/bridge.h>
-#include <linux/if_bridge.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/bridge_info.c b/lib/route/link/bridge_info.c
index c383743..2823a70 100644
--- a/lib/route/link/bridge_info.c
+++ b/lib/route/link/bridge_info.c
@@ -11,9 +11,12 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/route/link/bridge_info.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-api.h"
 
diff --git a/lib/route/link/can.c b/lib/route/link/can.c
index 9b203c6..c2bdb5c 100644
--- a/lib/route/link/can.c
+++ b/lib/route/link/can.c
@@ -16,7 +16,10 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/can/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -24,7 +27,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/can.h>
 
-#include <linux/can/netlink.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/dummy.c b/lib/route/link/dummy.c
index 7e23f3c..514a0cf 100644
--- a/lib/route/link/dummy.c
+++ b/lib/route/link/dummy.c
@@ -13,9 +13,12 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 
+#include <netlink-private/netlink.h>
+
 #include "link-api.h"
 
 static struct rtnl_link_info_ops dummy_info_ops = {
diff --git a/lib/route/link/geneve.c b/lib/route/link/geneve.c
index a06e65a..1e23ea2 100644
--- a/lib/route/link/geneve.c
+++ b/lib/route/link/geneve.c
@@ -15,13 +15,16 @@
  *
  * @{
  */
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/geneve.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-api.h"
 
diff --git a/lib/route/link/ifb.c b/lib/route/link/ifb.c
index d184d78..9c0f5c8 100644
--- a/lib/route/link/ifb.c
+++ b/lib/route/link/ifb.c
@@ -13,9 +13,12 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 
+#include <netlink-private/netlink.h>
+
 #include "link-api.h"
 
 static struct rtnl_link_info_ops ifb_info_ops = {
diff --git a/lib/route/link/inet.c b/lib/route/link/inet.c
index 128ebac..a5ed46f 100644
--- a/lib/route/link/inet.c
+++ b/lib/route/link/inet.c
@@ -51,12 +51,15 @@
  */
 
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/inet.h>
 
+#include <netlink-private/netlink.h>
+
 #include "link-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/link/inet6.c b/lib/route/link/inet6.c
index 62a3c9c..7a89f68 100644
--- a/lib/route/link/inet6.c
+++ b/lib/route/link/inet6.c
@@ -3,16 +3,17 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/inet6.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-api.h"
-
-#include "base/nl-base-utils.h"
 #include "nl-priv-static-route/nl-priv-static-route.h"
 
 #define I6_ADDR_GEN_MODE_UNKNOWN	UINT8_MAX
diff --git a/lib/route/link/ip6gre.c b/lib/route/link/ip6gre.c
index 630dab4..d518785 100644
--- a/lib/route/link/ip6gre.c
+++ b/lib/route/link/ip6gre.c
@@ -13,14 +13,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ip6gre.h>
-#include <linux/if_tunnel.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ip6tnl.c b/lib/route/link/ip6tnl.c
index 1ceb55d..0c5a4f6 100644
--- a/lib/route/link/ip6tnl.c
+++ b/lib/route/link/ip6tnl.c
@@ -16,15 +16,20 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <netinet/in.h>
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ip6tnl.h>
-#include <linux/if_tunnel.h>
-#include <netinet/in.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ip6vti.c b/lib/route/link/ip6vti.c
index 79fafb8..617f8a4 100644
--- a/lib/route/link/ip6vti.c
+++ b/lib/route/link/ip6vti.c
@@ -13,14 +13,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ip6vti.h>
-#include <linux/if_tunnel.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ipgre.c b/lib/route/link/ipgre.c
index 0fb9a13..79eb8ff 100644
--- a/lib/route/link/ipgre.c
+++ b/lib/route/link/ipgre.c
@@ -16,14 +16,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipgre.h>
-#include <linux/if_tunnel.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ipip.c b/lib/route/link/ipip.c
index 80662a5..8783667 100644
--- a/lib/route/link/ipip.c
+++ b/lib/route/link/ipip.c
@@ -16,14 +16,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipip.h>
-#include <linux/if_tunnel.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ipvlan.c b/lib/route/link/ipvlan.c
index 7404b06..5f85b44 100644
--- a/lib/route/link/ipvlan.c
+++ b/lib/route/link/ipvlan.c
@@ -16,7 +16,10 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_link.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -24,7 +27,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipvlan.h>
 
-#include <linux/if_link.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ipvti.c b/lib/route/link/ipvti.c
index 0de15e4..cb8586c 100644
--- a/lib/route/link/ipvti.c
+++ b/lib/route/link/ipvti.c
@@ -16,14 +16,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipvti.h>
-#include <linux/if_tunnel.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/macsec.c b/lib/route/link/macsec.c
index 2e44f41..86f1b1d 100644
--- a/lib/route/link/macsec.c
+++ b/lib/route/link/macsec.c
@@ -15,16 +15,19 @@
  *
  * @{
  */
-#include <netlink-private/netlink.h>
+
+#include "nl-default.h"
+
+#include <linux/if_macsec.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/macsec.h>
-#include "base/nl-base-utils.h"
 
-#include <linux/if_macsec.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/macvlan.c b/lib/route/link/macvlan.c
index 383d2d2..d6580f4 100644
--- a/lib/route/link/macvlan.c
+++ b/lib/route/link/macvlan.c
@@ -17,7 +17,10 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_link.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -26,7 +29,7 @@
 #include <netlink/route/link/macvlan.h>
 #include <netlink/route/link/macvtap.h>
 
-#include <linux/if_link.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/ppp.c b/lib/route/link/ppp.c
index f4a5cc0..11cd1ee 100644
--- a/lib/route/link/ppp.c
+++ b/lib/route/link/ppp.c
@@ -14,10 +14,12 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/route/link/ppp.h>
+#include <netlink/netlink.h>
 
 #include <netlink-private/netlink.h>
-#include <netlink/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/sit.c b/lib/route/link/sit.c
index 3b93ec0..031a727 100644
--- a/lib/route/link/sit.c
+++ b/lib/route/link/sit.c
@@ -16,14 +16,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_tunnel.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/sit.h>
-#include <linux/if_tunnel.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/sriov.c b/lib/route/link/sriov.c
index d63708d..4c4c85a 100644
--- a/lib/route/link/sriov.c
+++ b/lib/route/link/sriov.c
@@ -19,14 +19,17 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
-#include <netlink/netlink.h>
-#include <netlink/route/link.h>
+#include "nl-default.h"
 
 #include <linux/if_ether.h>
 #include <linux/if_link.h>
+
+#include <netlink/netlink.h>
+#include <netlink/route/link.h>
 #include <netlink/route/link/sriov.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-sriov.h"
 #include "link-api.h"
diff --git a/lib/route/link/team.c b/lib/route/link/team.c
index 6f722f1..d3a04e6 100644
--- a/lib/route/link/team.c
+++ b/lib/route/link/team.c
@@ -14,10 +14,13 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/link/team.h>
 
+#include <netlink-private/netlink.h>
+
 #include "link-api.h"
 
 /**
diff --git a/lib/route/link/veth.c b/lib/route/link/veth.c
index 58a3708..871c9b6 100644
--- a/lib/route/link/veth.c
+++ b/lib/route/link/veth.c
@@ -16,7 +16,11 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_link.h>
+#include <linux/veth.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -24,8 +28,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/veth.h>
 
-#include <linux/if_link.h>
-#include <linux/veth.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c
index 4416d0f..2ad4b8e 100644
--- a/lib/route/link/vlan.c
+++ b/lib/route/link/vlan.c
@@ -16,7 +16,10 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_vlan.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -24,7 +27,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/vlan.h>
 
-#include <linux/if_vlan.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/vrf.c b/lib/route/link/vrf.c
index da448eb..4583efe 100644
--- a/lib/route/link/vrf.c
+++ b/lib/route/link/vrf.c
@@ -17,7 +17,12 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_link.h>
+
+#include <linux-private/linux/rtnetlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -25,8 +30,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/vrf.h>
 
-#include <linux/if_link.h>
-#include <linux-private/linux/rtnetlink.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/vxlan.c b/lib/route/link/vxlan.c
index 4cf6700..332d4d4 100644
--- a/lib/route/link/vxlan.c
+++ b/lib/route/link/vxlan.c
@@ -16,7 +16,10 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <linux/if_link.h>
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -24,7 +27,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/vxlan.h>
 
-#include <linux/if_link.h>
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "link-api.h"
diff --git a/lib/route/link/xfrmi.c b/lib/route/link/xfrmi.c
index 56d7c91..37e7f70 100644
--- a/lib/route/link/xfrmi.c
+++ b/lib/route/link/xfrmi.c
@@ -18,7 +18,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -26,6 +27,8 @@
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/xfrmi.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "link-api.h"
 
diff --git a/lib/route/mdb.c b/lib/route/mdb.c
index eda5210..36a6b0b 100644
--- a/lib/route/mdb.c
+++ b/lib/route/mdb.c
@@ -3,6 +3,8 @@
  * lib/route/mdb.c		Multicast Database
  */
 
+#include "nl-default.h"
+
 #include <linux/if_bridge.h>
 
 #include <netlink/netlink.h>
diff --git a/lib/route/neigh.c b/lib/route/neigh.c
index 506703f..bd40b8a 100644
--- a/lib/route/neigh.c
+++ b/lib/route/neigh.c
@@ -143,7 +143,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/hashtable.h>
@@ -152,6 +153,8 @@
 #include <netlink/route/link.h>
 #include <netlink/hashtable.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/route/neightbl.c b/lib/route/neightbl.c
index e9dd35c..71b30cf 100644
--- a/lib/route/neightbl.c
+++ b/lib/route/neightbl.c
@@ -10,14 +10,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/neightbl.h>
 #include <netlink/route/link.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/route/netconf.c b/lib/route/netconf.c
index 8954e3b..b338bef 100644
--- a/lib/route/netconf.c
+++ b/lib/route/netconf.c
@@ -11,6 +11,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <linux/netconf.h>
 #include <linux/socket.h>
 
diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c
index 1f5a8c9..37fc060 100644
--- a/lib/route/nexthop.c
+++ b/lib/route/nexthop.c
@@ -9,12 +9,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/route.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nexthop-encap.h"
 #include "nl-route.h"
 
diff --git a/lib/route/nexthop_encap.c b/lib/route/nexthop_encap.c
index 41741ef..20c645b 100644
--- a/lib/route/nexthop_encap.c
+++ b/lib/route/nexthop_encap.c
@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-only */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <linux/lwtunnel.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "nexthop-encap.h"
 
diff --git a/lib/route/nh.c b/lib/route/nh.c
index 5bd8c7a..89fdef8 100644
--- a/lib/route/nh.c
+++ b/lib/route/nh.c
@@ -3,13 +3,16 @@
  * Copyright (c) 2022 Stanislav Zaikin <zstaseg@gmail.com>
  */
 
+#include "nl-default.h"
+
 #include <linux-private/linux/nexthop.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/route/nh.h>
 #include <netlink/hashtable.h>
 #include <netlink/route/nexthop.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-aux-route/nl-route.h"
 #include "nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/route/nh_encap_mpls.c b/lib/route/nh_encap_mpls.c
index a9c52af..6cf6dc5 100644
--- a/lib/route/nh_encap_mpls.c
+++ b/lib/route/nh_encap_mpls.c
@@ -1,10 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-only */
 
-#include <netlink-private/netlink.h>
-#include <netlink/route/nexthop.h>
+#include "nl-default.h"
+
 #include <linux/mpls_iptunnel.h>
 #include <linux/lwtunnel.h>
 
+#include <netlink/route/nexthop.h>
+
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "nexthop-encap.h"
 
diff --git a/lib/route/pktloc.c b/lib/route/pktloc.c
index 28680df..a82dac9 100644
--- a/lib/route/pktloc.c
+++ b/lib/route/pktloc.c
@@ -25,11 +25,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/pktloc.h>
 
+#include <netlink-private/netlink.h>
+
 #include "pktloc_syntax.h"
 #include "pktloc_grammar.h"
 
diff --git a/lib/route/qdisc.c b/lib/route/qdisc.c
index af3d65c..8a5db4f 100644
--- a/lib/route/qdisc.c
+++ b/lib/route/qdisc.c
@@ -9,7 +9,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/link.h>
@@ -17,6 +18,8 @@
 #include <netlink/route/class.h>
 #include <netlink/route/classifier.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 static struct nl_cache_ops rtnl_qdisc_ops;
diff --git a/lib/route/qdisc/blackhole.c b/lib/route/qdisc/blackhole.c
index 3a26e56..523ace9 100644
--- a/lib/route/qdisc/blackhole.c
+++ b/lib/route/qdisc/blackhole.c
@@ -9,9 +9,12 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 static struct rtnl_tc_ops blackhole_ops = {
diff --git a/lib/route/qdisc/cbq.c b/lib/route/qdisc/cbq.c
index fffc9ca..6a88a8b 100644
--- a/lib/route/qdisc/cbq.c
+++ b/lib/route/qdisc/cbq.c
@@ -3,7 +3,8 @@
  * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
@@ -12,6 +13,8 @@
 #include <netlink/route/qdisc/cbq.h>
 #include <netlink/route/cls/police.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct rtnl_cbq {
diff --git a/lib/route/qdisc/dsmark.c b/lib/route/qdisc/dsmark.c
index 1800a03..994a1e5 100644
--- a/lib/route/qdisc/dsmark.c
+++ b/lib/route/qdisc/dsmark.c
@@ -10,13 +10,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/qdisc/dsmark.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/fifo.c b/lib/route/qdisc/fifo.c
index cf00fba..2044e1a 100644
--- a/lib/route/qdisc/fifo.c
+++ b/lib/route/qdisc/fifo.c
@@ -23,12 +23,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/fifo.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/fq_codel.c b/lib/route/qdisc/fq_codel.c
index 158e875..d2915a3 100644
--- a/lib/route/qdisc/fq_codel.c
+++ b/lib/route/qdisc/fq_codel.c
@@ -11,12 +11,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/fq_codel.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/hfsc.c b/lib/route/qdisc/hfsc.c
index 2de89fd..d6d4583 100644
--- a/lib/route/qdisc/hfsc.c
+++ b/lib/route/qdisc/hfsc.c
@@ -10,7 +10,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
@@ -19,6 +20,8 @@
 #include <netlink/route/link.h>
 #include <netlink/route/qdisc/hfsc.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/htb.c b/lib/route/qdisc/htb.c
index 47716bd..ac8a204 100644
--- a/lib/route/qdisc/htb.c
+++ b/lib/route/qdisc/htb.c
@@ -12,7 +12,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
@@ -21,6 +22,8 @@
 #include <netlink/route/link.h>
 #include <netlink/route/qdisc/htb.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/ingress.c b/lib/route/qdisc/ingress.c
index 40d02d2..979ce67 100644
--- a/lib/route/qdisc/ingress.c
+++ b/lib/route/qdisc/ingress.c
@@ -10,11 +10,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/utils.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct dumb {
diff --git a/lib/route/qdisc/mqprio.c b/lib/route/qdisc/mqprio.c
index c650d2a..d518f8c 100644
--- a/lib/route/qdisc/mqprio.c
+++ b/lib/route/qdisc/mqprio.c
@@ -3,12 +3,15 @@
  * Copyright (c) 2018 Volodymyr Bendiuga <volodymyr.bendiuga@westermo.se>
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/mqprio.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/netem.c b/lib/route/qdisc/netem.c
index fc9fac6..2e4c36a 100644
--- a/lib/route/qdisc/netem.c
+++ b/lib/route/qdisc/netem.c
@@ -12,14 +12,16 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/netem.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
-#include "base/nl-base-utils.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/plug.c b/lib/route/qdisc/plug.c
index cd27757..1ab4bbe 100644
--- a/lib/route/qdisc/plug.c
+++ b/lib/route/qdisc/plug.c
@@ -54,11 +54,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc/plug.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 struct rtnl_plug {
diff --git a/lib/route/qdisc/prio.c b/lib/route/qdisc/prio.c
index 860cdb8..c2121c9 100644
--- a/lib/route/qdisc/prio.c
+++ b/lib/route/qdisc/prio.c
@@ -20,12 +20,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/prio.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/red.c b/lib/route/qdisc/red.c
index 575bab8..29d05bd 100644
--- a/lib/route/qdisc/red.c
+++ b/lib/route/qdisc/red.c
@@ -10,12 +10,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/red.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/sfq.c b/lib/route/qdisc/sfq.c
index 56ac8b8..d266676 100644
--- a/lib/route/qdisc/sfq.c
+++ b/lib/route/qdisc/sfq.c
@@ -17,12 +17,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/sfq.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/qdisc/tbf.c b/lib/route/qdisc/tbf.c
index d4254ad..e4db33b 100644
--- a/lib/route/qdisc/tbf.c
+++ b/lib/route/qdisc/tbf.c
@@ -9,7 +9,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
@@ -18,6 +19,8 @@
 #include <netlink/route/link.h>
 #include <netlink/route/qdisc/tbf.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/route.c b/lib/route/route.c
index 06f4fc9..6378693 100644
--- a/lib/route/route.c
+++ b/lib/route/route.c
@@ -10,7 +10,8 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
@@ -19,6 +20,8 @@
 #include <netlink/route/route.h>
 #include <netlink/route/link.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-priv-dynamic-core/nl-core.h"
 #include "nl-aux-route/nl-route.h"
 
diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index e1395df..193908d 100644
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -24,9 +24,10 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <linux/in_route.h>
 
-#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
@@ -37,6 +38,8 @@
 #include <netlink/route/link.h>
 #include <netlink/route/nexthop.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-route.h"
 #include "nl-aux-route/nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
index d573eb9..5dfa9dd 100644
--- a/lib/route/route_utils.c
+++ b/lib/route/route_utils.c
@@ -31,12 +31,15 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/route.h>
-	
+
+#include <netlink-private/netlink.h>
+
 /**
  * @name Routing Table Identifier Translations
  * @{
diff --git a/lib/route/rtnl.c b/lib/route/rtnl.c
index f28ebf3..5b2c7e9 100644
--- a/lib/route/rtnl.c
+++ b/lib/route/rtnl.c
@@ -8,11 +8,14 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 
+#include <netlink-private/netlink.h>
+
 /**
  * @name Sending
  * @{
diff --git a/lib/route/rule.c b/lib/route/rule.c
index ae6038e..43ce6a9 100644
--- a/lib/route/rule.c
+++ b/lib/route/rule.c
@@ -10,13 +10,18 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
+#include <inttypes.h>
+
+#include <linux/fib_rules.h>
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/rule.h>
-#include <inttypes.h>
-#include <linux/fib_rules.h>
+
+#include <netlink-private/netlink.h>
 
 #include "nl-route.h"
 #include "nl-priv-dynamic-core/nl-core.h"
diff --git a/lib/route/tc.c b/lib/route/tc.c
index b160044..6b0c372 100644
--- a/lib/route/tc.c
+++ b/lib/route/tc.c
@@ -9,15 +9,17 @@
  * @{
  */
 
-#include <netlink-private/netlink.h>
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link.h>
 #include <netlink/route/tc.h>
 
+#include <netlink-private/netlink.h>
+
 #include "tc-api.h"
-#include "base/nl-base-utils.h"
 
 /** @cond SKIP */
 
diff --git a/lib/socket.c b/lib/socket.c
index d81a8b3..4cc945a 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -25,14 +25,14 @@
 
 #include "sys/socket.h"
 
-#include <netlink-private/netlink.h>
-#include "base/nl-base-utils.h"
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/handlers.h>
 #include <netlink/msg.h>
 #include <netlink/attr.h>
 
+#include <netlink-private/netlink.h>
+
 #include "nl-core.h"
 #include "nl-priv-dynamic-core/nl-core.h"
 
diff --git a/lib/utils.c b/lib/utils.c
index b2adad4..7ed8b91 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -18,6 +18,8 @@
  * ~~~~
  */
 
+#include "nl-default.h"
+
 #include <stdlib.h>
 #include <locale.h>
 
@@ -28,7 +30,6 @@
 
 #include <netlink-private/netlink.h>
 
-#include "base/nl-base-utils.h"
 #include "nl-priv-dynamic-core/object-api.h"
 
 /**
diff --git a/lib/version.c b/lib/version.c
index ffde260..da4bd25 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -18,6 +18,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/version.h>
 
 const int      nl_ver_num = LIBNL_VER_NUM;
diff --git a/lib/xfrm/ae.c b/lib/xfrm/ae.c
index c0356aa..21a89a1 100644
--- a/lib/xfrm/ae.c
+++ b/lib/xfrm/ae.c
@@ -120,13 +120,15 @@
  * @{
  */
 
-#include <linux/xfrm.h>
+#include "nl-default.h"
 
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/object.h>
 #include <netlink/xfrm/ae.h>
 
+#include <linux/xfrm.h>
+
 #include <netlink-private/netlink.h>
 
 #include "nl-xfrm.h"
diff --git a/lib/xfrm/lifetime.c b/lib/xfrm/lifetime.c
index b72e1f4..f955bab 100644
--- a/lib/xfrm/lifetime.c
+++ b/lib/xfrm/lifetime.c
@@ -47,10 +47,13 @@
  * ~~~~
  */
 
+#include "nl-default.h"
+
 #include <netlink/xfrm/lifetime.h>
+
 #include <netlink-private/netlink.h>
 
-#include "lib/xfrm/nl-xfrm.h"
+#include "nl-xfrm.h"
 
 static void ltime_cfg_destroy(struct xfrmnl_ltime_cfg* ltime)
 {
diff --git a/lib/xfrm/sa.c b/lib/xfrm/sa.c
index acef51f..f67d994 100644
--- a/lib/xfrm/sa.c
+++ b/lib/xfrm/sa.c
@@ -39,6 +39,8 @@
  * @brief
  */
 
+#include "nl-default.h"
+
 #include <time.h>
 
 #include <netlink/netlink.h>
@@ -50,7 +52,6 @@
 
 #include <netlink-private/netlink.h>
 
-#include "base/nl-base-utils.h"
 #include "nl-xfrm.h"
 #include "nl-priv-dynamic-core/object-api.h"
 
diff --git a/lib/xfrm/selector.c b/lib/xfrm/selector.c
index 719de08..18ec498 100644
--- a/lib/xfrm/selector.c
+++ b/lib/xfrm/selector.c
@@ -47,7 +47,10 @@
  * ~~~~
  */
 
+#include "nl-default.h"
+
 #include <netlink/xfrm/selector.h>
+
 #include <netlink-private/netlink.h>
 
 /* Selector, used as selector both on policy rules (SPD) and SAs. */
diff --git a/lib/xfrm/sp.c b/lib/xfrm/sp.c
index 984726f..7d1e6ae 100644
--- a/lib/xfrm/sp.c
+++ b/lib/xfrm/sp.c
@@ -39,6 +39,8 @@
  * @brief
  */
 
+#include "nl-default.h"
+
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/object.h>
diff --git a/lib/xfrm/template.c b/lib/xfrm/template.c
index 4a627fa..1cb4739 100644
--- a/lib/xfrm/template.c
+++ b/lib/xfrm/template.c
@@ -47,7 +47,10 @@
  * ~~~~
  */
 
+#include "nl-default.h"
+
 #include <netlink/xfrm/template.h>
+
 #include <netlink-private/netlink.h>
 
 #include "nl-xfrm.h"
diff --git a/src/genl-ctrl-list.c b/src/genl-ctrl-list.c
index 62bed3c..035b3e2 100644
--- a/src/genl-ctrl-list.c
+++ b/src/genl-ctrl-list.c
@@ -3,10 +3,12 @@
  * Copyright (c) 2003-2012 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
+#include "nl-default.h"
 
 #include <linux/genetlink.h>
 
+#include <netlink/cli/utils.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/idiag-socket-details.c b/src/idiag-socket-details.c
index 6f03627..b44edab 100644
--- a/src/idiag-socket-details.c
+++ b/src/idiag-socket-details.c
@@ -3,10 +3,13 @@
  * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/idiag/idiagnl.h>
 #include <netlink/idiag/msg.h>
-#include <linux/netlink.h>
 
 static void print_usage(void)
 {
diff --git a/src/lib/addr.c b/src/lib/addr.c
index a79e9b4..7b12f36 100644
--- a/src/lib/addr.c
+++ b/src/lib/addr.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/addr.h>
 
diff --git a/src/lib/class.c b/src/lib/class.c
index d7312c3..9373b07 100644
--- a/src/lib/class.c
+++ b/src/lib/class.c
@@ -9,6 +9,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/class.h>
 
diff --git a/src/lib/cls.c b/src/lib/cls.c
index d8fd1a8..9c94b0d 100644
--- a/src/lib/cls.c
+++ b/src/lib/cls.c
@@ -9,6 +9,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/cls.h>
 #include <netlink/route/cls/ematch.h>
diff --git a/src/lib/ct.c b/src/lib/ct.c
index c00c0fb..959a850 100644
--- a/src/lib/ct.c
+++ b/src/lib/ct.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/ct.h>
 
diff --git a/src/lib/exp.c b/src/lib/exp.c
index 48d4ea0..dcda30c 100644
--- a/src/lib/exp.c
+++ b/src/lib/exp.c
@@ -11,6 +11,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/exp.h>
 
diff --git a/src/lib/link.c b/src/lib/link.c
index d1c3e4b..67580b4 100644
--- a/src/lib/link.c
+++ b/src/lib/link.c
@@ -10,9 +10,12 @@
  * @{
  */
 
+#include "nl-default.h"
+
+#include <linux/if.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
-#include <linux/if.h>
 
 struct rtnl_link *nl_cli_link_alloc(void)
 {
diff --git a/src/lib/neigh.c b/src/lib/neigh.c
index 5b44f47..a4b211e 100644
--- a/src/lib/neigh.c
+++ b/src/lib/neigh.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/neigh.h>
 
diff --git a/src/lib/nh.c b/src/lib/nh.c
index 7f9722b..c1f5137 100644
--- a/src/lib/nh.c
+++ b/src/lib/nh.c
@@ -10,10 +10,13 @@
  * @{
  */
 
+#include "nl-default.h"
+
+#include <linux/if.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/nh.h>
 #include <netlink/route/nh.h>
-#include <linux/if.h>
 
 struct rtnl_nh *nl_cli_nh_alloc(void)
 {
diff --git a/src/lib/qdisc.c b/src/lib/qdisc.c
index beb83cc..659594a 100644
--- a/src/lib/qdisc.c
+++ b/src/lib/qdisc.c
@@ -9,6 +9,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/qdisc.h>
 #include <netlink/route/class.h>
diff --git a/src/lib/route.c b/src/lib/route.c
index 7297a2f..d814950 100644
--- a/src/lib/route.c
+++ b/src/lib/route.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/route.h>
 
diff --git a/src/lib/rule.c b/src/lib/rule.c
index 6ef9321..8a54e73 100644
--- a/src/lib/rule.c
+++ b/src/lib/rule.c
@@ -10,6 +10,8 @@
  * @{
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/rule.h>
 
diff --git a/src/lib/tc.c b/src/lib/tc.c
index 57ad54e..3bed636 100644
--- a/src/lib/tc.c
+++ b/src/lib/tc.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 
diff --git a/src/nf-ct-add.c b/src/nf-ct-add.c
index 632acd9..cefa837 100644
--- a/src/nf-ct-add.c
+++ b/src/nf-ct-add.c
@@ -5,11 +5,13 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/ct.h>
+#include "nl-default.h"
 
 #include <linux/rtnetlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/ct.h>
+
 static int quiet = 0;
 
 static void print_usage(void)
diff --git a/src/nf-ct-events.c b/src/nf-ct-events.c
index 68f9ac0..cd69045 100644
--- a/src/nf-ct-events.c
+++ b/src/nf-ct-events.c
@@ -3,13 +3,15 @@
  * Copyright (c) 2018 Avast software
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/ct.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_conntrack.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/ct.h>
+
 struct private_nl_object
 {
 	int			ce_refcnt;
diff --git a/src/nf-ct-list.c b/src/nf-ct-list.c
index 692c24b..3b34572 100644
--- a/src/nf-ct-list.c
+++ b/src/nf-ct-list.c
@@ -5,11 +5,13 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/ct.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/ct.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nf-exp-add.c b/src/nf-exp-add.c
index ae74528..68f0898 100644
--- a/src/nf-exp-add.c
+++ b/src/nf-exp-add.c
@@ -6,11 +6,13 @@
  * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/exp.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/exp.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 9d1eea9..a57a69d 100644
--- a/src/nf-exp-delete.c
+++ b/src/nf-exp-delete.c
@@ -6,11 +6,13 @@
  * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/exp.h>
+#include "nl-default.h"
 
 #include <linux/rtnetlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/exp.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 25fd51f..f469fea 100644
--- a/src/nf-exp-list.c
+++ b/src/nf-exp-list.c
@@ -6,11 +6,13 @@
  * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/exp.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/exp.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nf-log.c b/src/nf-log.c
index c9ad560..17f73a8 100644
--- a/src/nf-log.c
+++ b/src/nf-log.c
@@ -5,14 +5,16 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
+#include "nl-default.h"
+
+#include <linux/netfilter/nfnetlink_log.h>
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.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 1f67289..21f8edd 100644
--- a/src/nf-monitor.c
+++ b/src/nf-monitor.c
@@ -5,12 +5,14 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/netfilter/nfnl.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 #include <linux/netfilter/nfnetlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/netfilter/nfnl.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 ec15f63..0e3f060 100644
--- a/src/nf-queue.c
+++ b/src/nf-queue.c
@@ -4,17 +4,20 @@
  * Copyright (c) 2010  Karl Hiramoto <karl@hiramoto.org>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
+
 #include <netinet/in.h>
+
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink_queue.h>
+#include <linux/netlink.h>
+
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.h>
 #include <netlink/netfilter/nfnl.h>
 #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 3560f4d..a57d3f4 100644
--- a/src/nl-addr-add.c
+++ b/src/nl-addr-add.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 a8887ac..6608105 100644
--- a/src/nl-addr-delete.c
+++ b/src/nl-addr-delete.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 d80d862..50176ef 100644
--- a/src/nl-addr-list.c
+++ b/src/nl-addr-list.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 355dd93..ac37daa 100644
--- a/src/nl-class-add.c
+++ b/src/nl-class-add.c
@@ -3,14 +3,16 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/cli/qdisc.h>
 #include <netlink/cli/class.h>
 #include <netlink/cli/link.h>
 
-#include <linux/netlink.h>
-
 #include "nl-priv-dynamic-route/nl-priv-dynamic-route.h"
 
 static int quiet = 0;
diff --git a/src/nl-class-delete.c b/src/nl-class-delete.c
index 1747a65..88dc59e 100644
--- a/src/nl-class-delete.c
+++ b/src/nl-class-delete.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 ba8e154..8b5cd6c 100644
--- a/src/nl-class-list.c
+++ b/src/nl-class-list.c
@@ -3,13 +3,15 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #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 7b82c37..397fcb4 100644
--- a/src/nl-classid-lookup.c
+++ b/src/nl-classid-lookup.c
@@ -3,9 +3,12 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
+#include "nl-default.h"
+
 #include <linux/pkt_sched.h>
 
+#include <netlink/cli/utils.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-cls-add.c b/src/nl-cls-add.c
index eaacf9b..dd6d4ec 100644
--- a/src/nl-cls-add.c
+++ b/src/nl-cls-add.c
@@ -3,13 +3,15 @@
  * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/cli/cls.h>
 #include <netlink/cli/link.h>
 
-#include <linux/netlink.h>
-
 #include "nl-priv-dynamic-route/nl-priv-dynamic-route.h"
 
 static int quiet = 0;
diff --git a/src/nl-cls-delete.c b/src/nl-cls-delete.c
index 20079a2..ca8e370 100644
--- a/src/nl-cls-delete.c
+++ b/src/nl-cls-delete.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 65757d0..5a4e638 100644
--- a/src/nl-cls-list.c
+++ b/src/nl-cls-list.c
@@ -3,13 +3,15 @@
  * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #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 4239063..a1470c7 100644
--- a/src/nl-fib-lookup.c
+++ b/src/nl-fib-lookup.c
@@ -3,10 +3,12 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
+#include "nl-default.h"
 
 #include <linux/rtnetlink.h>
 
+#include <netlink/cli/utils.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-link-enslave.c b/src/nl-link-enslave.c
index ba4817a..5c6dc02 100644
--- a/src/nl-link-enslave.c
+++ b/src/nl-link-enslave.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 05eb788..200c9f2 100644
--- a/src/nl-link-ifindex2name.c
+++ b/src/nl-link-ifindex2name.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.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 e07bd43..aec96cb 100644
--- a/src/nl-link-list.c
+++ b/src/nl-link-list.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-link-name2ifindex.c b/src/nl-link-name2ifindex.c
index 3ff774e..e35ee27 100644
--- a/src/nl-link-name2ifindex.c
+++ b/src/nl-link-name2ifindex.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.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 1c869ad..9d04413 100644
--- a/src/nl-link-release.c
+++ b/src/nl-link-release.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2011 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 5b54da0..c301542 100644
--- a/src/nl-link-set.c
+++ b/src/nl-link-set.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
 
 #include <linux/if.h>
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.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 d993f71..07e5e1c 100644
--- a/src/nl-link-stats.c
+++ b/src/nl-link-stats.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-list-caches.c b/src/nl-list-caches.c
index 548d6a5..e9a44d3 100644
--- a/src/nl-list-caches.c
+++ b/src/nl-list-caches.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 
 #include <netlink-private/netlink.h>
diff --git a/src/nl-list-sockets.c b/src/nl-list-sockets.c
index b69b2c2..bb27df0 100644
--- a/src/nl-list-sockets.c
+++ b/src/nl-list-sockets.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 
 #define PROC_NETLINK "/proc/net/netlink"
diff --git a/src/nl-monitor.c b/src/nl-monitor.c
index 86294fb..60a02d2 100644
--- a/src/nl-monitor.c
+++ b/src/nl-monitor.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/rtnetlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
 #include <netlink/cli/mdb.h>
 
-#include <linux/rtnetlink.h>
-
 static const struct {
 	enum rtnetlink_groups gr_id;
 	const char* gr_name;
diff --git a/src/nl-neigh-add.c b/src/nl-neigh-add.c
index cd6063e..d4d926d 100644
--- a/src/nl-neigh-add.c
+++ b/src/nl-neigh-add.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 6f1ffef..29effcb 100644
--- a/src/nl-neigh-delete.c
+++ b/src/nl-neigh-delete.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 2664c8f..80fce0b 100644
--- a/src/nl-neigh-list.c
+++ b/src/nl-neigh-list.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 5a5b0a0..596b6ee 100644
--- a/src/nl-neightbl-list.c
+++ b/src/nl-neightbl-list.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/cli/link.h>
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+#include <netlink/cli/link.h>
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/nl-nh-list.c b/src/nl-nh-list.c
index 17568df..18fc5f4 100644
--- a/src/nl-nh-list.c
+++ b/src/nl-nh-list.c
@@ -3,13 +3,14 @@
  * Copyright (c) 2022 Stanislav Zaikin <zstaseg@gmail.com>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/nh.h>
-
 #include <netlink/route/nh.h>
 
-#include <linux/netlink.h>
-
 static void print_usage(void)
 {
 	printf("Usage: nl-nh-list [OPTIONS]... \n"
diff --git a/src/nl-pktloc-lookup.c b/src/nl-pktloc-lookup.c
index 32d8d5a..90502a3 100644
--- a/src/nl-pktloc-lookup.c
+++ b/src/nl-pktloc-lookup.c
@@ -3,11 +3,12 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink/cli/utils.h>
-#include <netlink/route/pktloc.h>
+#include "nl-default.h"
+
 #include <linux/tc_ematch/tc_em_cmp.h>
 
-#include "base/nl-base-utils.h"
+#include <netlink/cli/utils.h>
+#include <netlink/route/pktloc.h>
 
 static void print_usage(void)
 {
diff --git a/src/nl-qdisc-add.c b/src/nl-qdisc-add.c
index a3789b7..40b9546 100644
--- a/src/nl-qdisc-add.c
+++ b/src/nl-qdisc-add.c
@@ -3,13 +3,15 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/cli/qdisc.h>
 #include <netlink/cli/link.h>
 
-#include <linux/netlink.h>
-
 #include "nl-priv-dynamic-route/nl-priv-dynamic-route.h"
 
 static int quiet = 0;
diff --git a/src/nl-qdisc-delete.c b/src/nl-qdisc-delete.c
index 299fd48..8c89372 100644
--- a/src/nl-qdisc-delete.c
+++ b/src/nl-qdisc-delete.c
@@ -3,13 +3,15 @@
  * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #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 d1825da..f41cca2 100644
--- a/src/nl-qdisc-list.c
+++ b/src/nl-qdisc-list.c
@@ -3,6 +3,11 @@
  * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/pkt_sched.h>
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
 #include <netlink/cli/qdisc.h>
@@ -10,9 +15,6 @@
 #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 4e96ab0..04fca9f 100644
--- a/src/nl-route-add.c
+++ b/src/nl-route-add.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 9b4366c..17d50b5 100644
--- a/src/nl-route-delete.c
+++ b/src/nl-route-delete.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 b49ba4c..ce845b2 100644
--- a/src/nl-route-get.c
+++ b/src/nl-route-get.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/rtnetlink.h>
+
 #include <netlink/cli/utils.h>
 #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 1b293ed..284e240 100644
--- a/src/nl-route-list.c
+++ b/src/nl-route-list.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 fe87dfe..b31c575 100644
--- a/src/nl-rule-list.c
+++ b/src/nl-rule-list.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/cli/utils.h>
 #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 16f6f00..63dcc15 100644
--- a/src/nl-tctree-list.c
+++ b/src/nl-tctree-list.c
@@ -3,14 +3,16 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+#include <linux/pkt_sched.h>
+
 #include <netlink/cli/utils.h>
 #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;
 static struct nl_cache *qdisc_cache, *class_cache;
 static struct nl_dump_params params = {
diff --git a/src/nl-util-addr.c b/src/nl-util-addr.c
index de92302..fc8ebdd 100644
--- a/src/nl-util-addr.c
+++ b/src/nl-util-addr.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <netlink/cli/utils.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/check-all.c b/tests/check-all.c
index aff16cb..e8a0e80 100644
--- a/tests/check-all.c
+++ b/tests/check-all.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2013 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <check.h>
 
 #include "cksuite-all.h"
diff --git a/tests/check-direct.c b/tests/check-direct.c
index ad3d7c4..8cb4932 100644
--- a/tests/check-direct.c
+++ b/tests/check-direct.c
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-only */
 
+#include "nl-default.h"
+
 #include <check.h>
 
-#include "linux/snmp.h"
-#include "base/nl-base-utils.h"
+#include <linux/snmp.h>
+
+#include <netlink/route/link.h>
 
-#include "netlink/route/link.h"
 #include "nl-priv-static-route/nl-priv-static-route.h"
 
 START_TEST(static_checks)
diff --git a/tests/cksuite-all-addr.c b/tests/cksuite-all-addr.c
index f395351..f4ee0dd 100644
--- a/tests/cksuite-all-addr.c
+++ b/tests/cksuite-all-addr.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2013 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <check.h>
 #include <netlink/addr.h>
 #include <netlink/route/addr.h>
diff --git a/tests/cksuite-all-attr.c b/tests/cksuite-all-attr.c
index a4bd271..9b7f2d4 100644
--- a/tests/cksuite-all-attr.c
+++ b/tests/cksuite-all-attr.c
@@ -3,13 +3,16 @@
  * Copyright (c) 2013 Thomas Graf <tgraf@suug.ch>
  */
 
+#include "nl-default.h"
+
 #include <linux/netlink.h>
 #include <linux/if_ether.h>
 
+#include <netlink/attr.h>
+#include <netlink/msg.h>
+#include <netlink/route/cls/u32.h>
+
 #include "cksuite-all.h"
-#include "netlink/attr.h"
-#include "netlink/msg.h"
-#include "netlink/route/cls/u32.h"
 
 #include "nl-aux-route/nl-route.h"
 
diff --git a/tests/cksuite-all-ematch-tree-clone.c b/tests/cksuite-all-ematch-tree-clone.c
index 2b4ec9e..d86e25f 100644
--- a/tests/cksuite-all-ematch-tree-clone.c
+++ b/tests/cksuite-all-ematch-tree-clone.c
@@ -1,11 +1,18 @@
-#include <linux/netlink.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <stdio.h>
 #include <time.h>
 #include <check.h>
 
-#include "netlink/route/cls/ematch.h"
+#include <linux/netlink.h>
+
+#include <netlink/route/cls/ematch.h>
+
 #include "nl-aux-route/nl-route.h"
 #include "nl-priv-dynamic-route/nl-priv-dynamic-route.h"
+
 #include "cksuite-all.h"
 
 #define MAX_DEPTH 6
diff --git a/tests/cksuite-all-netns.c b/tests/cksuite-all-netns.c
index fafe01b..4414c4d 100644
--- a/tests/cksuite-all-netns.c
+++ b/tests/cksuite-all-netns.c
@@ -4,13 +4,15 @@
  * Copyright (c) 2018 Red Hat, Inc.
  */
 
+#include "nl-default.h"
+
 #include <stdlib.h>
 #include <stdbool.h>
+
 #include <linux/netlink.h>
 
-#include "base/nl-base-utils.h"
-#include "netlink/route/link.h"
-#include "netlink/route/link/sit.h"
+#include <netlink/route/link.h>
+#include <netlink/route/link/sit.h>
 #include <netlink/route/link/bonding.h>
 #include <netlink/route/link/bridge.h>
 #include <netlink/route/link/ip6tnl.h>
diff --git a/tests/nl-test-util.c b/tests/nl-test-util.c
index b101be5..94d81fb 100644
--- a/tests/nl-test-util.c
+++ b/tests/nl-test-util.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-only */
 
+#include "nl-default.h"
+
 #include "nl-test-util.h"
 
 #include <fcntl.h>
@@ -12,12 +14,10 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "base/nl-base-utils.h"
-
-#include "netlink/netlink.h"
-#include "netlink/route/link.h"
-#include "netlink/route/route.h"
-#include "netlink/socket.h"
+#include <netlink/netlink.h>
+#include <netlink/route/link.h>
+#include <netlink/route/route.h>
+#include <netlink/socket.h>
 
 #include "nl-aux-route/nl-route.h"
 
diff --git a/tests/test-cache-mngr.c b/tests/test-cache-mngr.c
index bae2d22..d1f6a03 100644
--- a/tests/test-cache-mngr.c
+++ b/tests/test-cache-mngr.c
@@ -1,6 +1,7 @@
-#include <netlink/netlink.h>
-#include <netlink/cache.h>
-#include <netlink/cli/utils.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <signal.h>
 #include <stdbool.h>
 #include <sys/time.h>
@@ -8,6 +9,10 @@
 
 #include <linux/netlink.h>
 
+#include <netlink/netlink.h>
+#include <netlink/cache.h>
+#include <netlink/cli/utils.h>
+
 static int quit = 0;
 static int change = 1;
 static int print_ts = 0;
diff --git a/tests/test-complex-HTB-with-hash-filters.c b/tests/test-complex-HTB-with-hash-filters.c
index 016d467..fea72c4 100644
--- a/tests/test-complex-HTB-with-hash-filters.c
+++ b/tests/test-complex-HTB-with-hash-filters.c
@@ -3,6 +3,15 @@
  * Copyright (c) 2011 Adrian Ban <adrian.ban@mantech.ro>
  */
 
+#include "nl-default.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <linux/if_ether.h>
+#include <linux/pkt_cls.h>
+#include <linux/netlink.h>
+
 #include <netlink/route/link.h>
 #include <netlink/route/tc.h>
 #include <netlink/route/qdisc.h>
@@ -11,17 +20,7 @@
 #include <netlink/route/cls/u32.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/class.h>
-#include <linux/if_ether.h>
-#include <linux/pkt_cls.h>
-
 #include <netlink/attr.h>
-//#include "include/rtnl_u32.h"
-
-#include <stdio.h>
-#include <string.h>
-//#include "include/rtnl_u32_addon.h"
-
-#include <linux/netlink.h>
 
 #define 	TC_HANDLE(maj, min)   (TC_H_MAJ((maj) << 16) | TC_H_MIN(min))
 
diff --git a/tests/test-create-bond.c b/tests/test-create-bond.c
index 326e0ef..6edb41f 100644
--- a/tests/test-create-bond.c
+++ b/tests/test-create-bond.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/bonding.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-bridge.c b/tests/test-create-bridge.c
index a9d9f2e..758aaa2 100644
--- a/tests/test-create-bridge.c
+++ b/tests/test-create-bridge.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/bridge.h>
 
-#include <linux/netlink.h>
-
 #define TEST_BRIDGE_NAME "testbridge"
 #define TEST_INTERFACE_NAME "testtap1"
 
diff --git a/tests/test-create-geneve.c b/tests/test-create-geneve.c
index 37b220a..1816e5b 100644
--- a/tests/test-create-geneve.c
+++ b/tests/test-create-geneve.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/geneve.h>
 
-#include <linux/netlink.h>
-
 #define IPv6 1
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-ifb.c b/tests/test-create-ifb.c
index d154ffd..ed42b71 100644
--- a/tests/test-create-ifb.c
+++ b/tests/test-create-ifb.c
@@ -1,8 +1,14 @@
-#include <netlink/netlink.h>
-#include <netlink/route/link.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include <linux/netlink.h>
+
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/netlink.h>
+#include <netlink/route/link.h>
+
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-ip6tnl.c b/tests/test-create-ip6tnl.c
index b36ab3d..ca2efb9 100644
--- a/tests/test-create-ip6tnl.c
+++ b/tests/test-create-ip6tnl.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/ip6tnl.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-ipgre.c b/tests/test-create-ipgre.c
index 66ea6da..23a4329 100644
--- a/tests/test-create-ipgre.c
+++ b/tests/test-create-ipgre.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/ipgre.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-ipgretap.c b/tests/test-create-ipgretap.c
index 1fe8231..40f15c5 100644
--- a/tests/test-create-ipgretap.c
+++ b/tests/test-create-ipgretap.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/ipgre.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-ipip.c b/tests/test-create-ipip.c
index 44b9b2c..2f8e009 100644
--- a/tests/test-create-ipip.c
+++ b/tests/test-create-ipip.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/ipip.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-ipvlan.c b/tests/test-create-ipvlan.c
index 50bac54..b0b200c 100644
--- a/tests/test-create-ipvlan.c
+++ b/tests/test-create-ipvlan.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/ipvlan.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-ipvti.c b/tests/test-create-ipvti.c
index 6cb92d7..ce676ec 100644
--- a/tests/test-create-ipvti.c
+++ b/tests/test-create-ipvti.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/ipvti.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-macsec.c b/tests/test-create-macsec.c
index efadf6b..b702f7d 100644
--- a/tests/test-create-macsec.c
+++ b/tests/test-create-macsec.c
@@ -1,10 +1,13 @@
-#include <netlink/netlink.h>
-#include <netlink/route/link.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 #include <linux/if_link.h>
 
 #include <netlink/route/link/macsec.h>
+#include <netlink/netlink.h>
+#include <netlink/route/link.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/test-create-macvlan.c b/tests/test-create-macvlan.c
index f520b67..665c502 100644
--- a/tests/test-create-macvlan.c
+++ b/tests/test-create-macvlan.c
@@ -1,11 +1,15 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netinet/ether.h>
 
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/macvlan.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-macvtap.c b/tests/test-create-macvtap.c
index 27d1969..c3e19a7 100644
--- a/tests/test-create-macvtap.c
+++ b/tests/test-create-macvtap.c
@@ -1,11 +1,15 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netinet/ether.h>
 
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/macvtap.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-sit.c b/tests/test-create-sit.c
index d33e496..8adf83f 100644
--- a/tests/test-create-sit.c
+++ b/tests/test-create-sit.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/sit.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-create-veth.c b/tests/test-create-veth.c
index 9600f8d..fda4d2e 100644
--- a/tests/test-create-veth.c
+++ b/tests/test-create-veth.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/veth.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-vlan.c b/tests/test-create-vlan.c
index 04756d4..e2cd2b1 100644
--- a/tests/test-create-vlan.c
+++ b/tests/test-create-vlan.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/vlan.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-vrf.c b/tests/test-create-vrf.c
index c3d23e7..b5f7176 100644
--- a/tests/test-create-vrf.c
+++ b/tests/test-create-vrf.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/vrf.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct nl_cache *link_cache;
diff --git a/tests/test-create-vxlan.c b/tests/test-create-vxlan.c
index 855fdb5..6d2fd94 100644
--- a/tests/test-create-vxlan.c
+++ b/tests/test-create-vxlan.c
@@ -1,9 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
+#include <linux/netlink.h>
+
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 #include <netlink/route/link/vxlan.h>
 
-#include <linux/netlink.h>
-
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-create-xfrmi.c b/tests/test-create-xfrmi.c
index 3a01a4f..8845b6e 100644
--- a/tests/test-create-xfrmi.c
+++ b/tests/test-create-xfrmi.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <netlink/route/link/xfrmi.h>
+
 #include <netlink-private/netlink.h>
 
 int main(int argc, char *argv[])
diff --git a/tests/test-delete-link.c b/tests/test-delete-link.c
index 8633123..58c70f0 100644
--- a/tests/test-delete-link.c
+++ b/tests/test-delete-link.c
@@ -1,8 +1,12 @@
-#include <netlink/netlink.h>
-#include <netlink/route/link.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/netlink.h>
+#include <netlink/route/link.h>
+
 int main(int argc, char *argv[])
 {
 	struct rtnl_link *link;
diff --git a/tests/test-genl.c b/tests/test-genl.c
index 42db501..5db23f0 100644
--- a/tests/test-genl.c
+++ b/tests/test-genl.c
@@ -1,8 +1,12 @@
-#include <netlink/cli/utils.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
 
 #include <linux/taskstats.h>
 #include <linux/genetlink.h>
 
+#include <netlink/cli/utils.h>
+
 static struct nla_policy attr_policy[TASKSTATS_TYPE_MAX+1] = {
 	[TASKSTATS_TYPE_PID]	= { .type = NLA_U32 },
 	[TASKSTATS_TYPE_TGID]	= { .type = NLA_U32 },
diff --git a/tests/test-loopback-up-down.c b/tests/test-loopback-up-down.c
index 5a7bcb1..fdb5a98 100644
--- a/tests/test-loopback-up-down.c
+++ b/tests/test-loopback-up-down.c
@@ -1,4 +1,9 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <net/if.h>
+
 #include <netlink/route/link.h>
 
 int main(void)
diff --git a/tests/test-nf-cache-mngr.c b/tests/test-nf-cache-mngr.c
index 7625e3f..7dcc9fc 100644
--- a/tests/test-nf-cache-mngr.c
+++ b/tests/test-nf-cache-mngr.c
@@ -1,7 +1,11 @@
-#include <netlink/cli/utils.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
 
 #include <linux/netlink.h>
 
+#include <netlink/cli/utils.h>
+
 static void change_cb(struct nl_cache *cache, struct nl_object *obj,
 		      int action, void *data)
 {
diff --git a/tests/test-socket-creation.c b/tests/test-socket-creation.c
index 83f3ad4..cf104ba 100644
--- a/tests/test-socket-creation.c
+++ b/tests/test-socket-creation.c
@@ -1,6 +1,11 @@
-#include <netlink/netlink.h>
+/* SPDX-License-Identifier: LGPL-2.1-only */
+
+#include "nl-default.h"
+
 #include <errno.h>
 
+#include <netlink/netlink.h>
+
 int main(int argc, char *argv[])
 {
 	struct nl_sock *h[1025];
diff --git a/tests/test-u32-filter-with-actions.c b/tests/test-u32-filter-with-actions.c
index 17e7bdc..1fe663c 100644
--- a/tests/test-u32-filter-with-actions.c
+++ b/tests/test-u32-filter-with-actions.c
@@ -5,6 +5,15 @@
  * Stolen from tests/test-complex-HTB-with-hash-filters.c
  */
 
+#include "nl-default.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <linux/if_ether.h>
+#include <linux/tc_act/tc_mirred.h>
+#include <linux/netlink.h>
+
 #include <netlink/route/link.h>
 #include <netlink/route/tc.h>
 #include <netlink/route/qdisc.h>
@@ -16,13 +25,6 @@
 #include <netlink/route/class.h>
 #include <netlink/attr.h>
 
-#include <stdio.h>
-#include <string.h>
-
-#include <linux/if_ether.h>
-#include <linux/tc_act/tc_mirred.h>
-#include <linux/netlink.h>
-
 #define 	TC_HANDLE(maj, min)   (TC_H_MAJ((maj) << 16) | TC_H_MIN(min))
 
 /* some functions are copied from iproute-tc tool */