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

10 files changed, 22 insertions, 19 deletions

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(