Move private header files to <netlink-private/*>

This clarifies the seperation between public and private
header files.

Signed-off-by: Thomas Graf <tgraf@suug.ch>

diff --git a/include/Makefile.am b/include/Makefile.am
index 50d1e4e5606545826489ead6d38765c660b6132c..50f96b7ce8ae0ad54fd405e701e47e22044be6a2 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -116,12 +116,11 @@ noinst_HEADERS = \
        linux/rtnetlink.h \
        linux/snmp.h \
        linux/tc_ematch/tc_em_meta.h \
-       netlink-generic.h \
-       netlink-local.h \
-       netlink-tc.h \
-       netlink-types.h \
-       netlink/cache-api.h \
-       netlink/object-api.h \
-       netlink/route/link/api.h \
-       netlink/route/link/info-api.h \
-       netlink/route/tc-api.h
+       netlink-private/genl.h \
+       netlink-private/netlink.h \
+       netlink-private/tc.h \
+       netlink-private/types.h \
+       netlink-private/cache-api.h \
+       netlink-private/object-api.h \
+       netlink-private/route/link/api.h \
+       netlink-private/route/tc-api.h

diff --git a/include/netlink/cache-api.h b/include/netlink-private/cache-api.h
similarity index 98%
rename from include/netlink/cache-api.h
rename to include/netlink-private/cache-api.h
index 493a551358e405ff91f2e0b8ec68002a9cd0c69a..5d9b0ad8eda22e03a5d54ee38cab164888a860ae 100644 (file)
--- a/include/netlink/cache-api.h
+++ b/include/netlink-private/cache-api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/cache-api.h         Caching API
+ * netlink-private/cache-api.h         Caching API
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2012 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_CACHE_API_H_

diff --git a/include/netlink-generic.h b/include/netlink-private/genl.h
similarity index 71%
rename from include/netlink-generic.h
rename to include/netlink-private/genl.h
index 10aa2f01bb1a2559f503797a37902257f624d0e8..0aca6d736a3b3b620390ebc66bc6309fbe40150e 100644 (file)
--- a/include/netlink-generic.h
+++ b/include/netlink-private/genl.h
@@ -1,18 +1,18 @@
 /*
- * netlink-generic.h   Local Generic Netlink Interface
+ * netlink-private/genl.h      Local Generic Netlink Interface
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_GENL_PRIV_H_
 #define NETLINK_GENL_PRIV_H_
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 
 #define GENL_HDRSIZE(hdrlen) (GENL_HDRLEN + (hdrlen))

diff --git a/include/netlink-local.h b/include/netlink-private/netlink.h
similarity index 96%
rename from include/netlink-local.h
rename to include/netlink-private/netlink.h
index c0915f857d29f85505f494db9e1d3e0bf7958359..6ae6d179a8e6ee1d62c336ae395a25528b88892b 100644 (file)
--- a/include/netlink-local.h
+++ b/include/netlink-private/netlink.h
@@ -1,12 +1,12 @@
 /*
- * netlink-local.h             Local Netlink Interface
+ * netlink-private/netlink.h   Local Netlink Interface
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_LOCAL_H_
@@ -63,9 +63,9 @@
 #include <netlink/handlers.h>
 #include <netlink/cache.h>
 #include <netlink/route/tc.h>
-#include <netlink/object-api.h>
-#include <netlink/cache-api.h>
-#include <netlink-types.h>
+#include <netlink-private/object-api.h>
+#include <netlink-private/cache-api.h>
+#include <netlink-private/types.h>
 
 struct trans_tbl {
        int i;

diff --git a/include/netlink/object-api.h b/include/netlink-private/object-api.h
similarity index 98%
rename from include/netlink/object-api.h
rename to include/netlink-private/object-api.h
index ae6180ac4d1a8c9a6f8089517ad2a5fd6bba1237..f4fd71e576ec6684989f6d966d44b9f88d62338f 100644 (file)
--- a/include/netlink/object-api.h
+++ b/include/netlink-private/object-api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/object-api.c                Object API
+ * netlink-private/object-api.c                Object API
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2007 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_OBJECT_API_H_
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
+#include <netlink/object.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/netlink/route/link/api.h b/include/netlink-private/route/link/api.h
similarity index 97%
rename from include/netlink/route/link/api.h
rename to include/netlink-private/route/link/api.h
index 28f246479899aab3708c1fae7baef129cba90609..bb98cccb080f56c7c0c3c349904028b1d363188a 100644 (file)
--- a/include/netlink/route/link/api.h
+++ b/include/netlink-private/route/link/api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/route/link/api.h    Link Modules API
+ * netlink-private/route/link/api.h    Link Modules API
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_LINK_API_H_

diff --git a/include/netlink/route/tc-api.h b/include/netlink-private/route/tc-api.h
similarity index 95%
rename from include/netlink/route/tc-api.h
rename to include/netlink-private/route/tc-api.h
index 601a8df975470daff9b3ac861a002ace240662ff..bf0c8a3b714570f76de50996c49a0152746dd793 100644 (file)
--- a/include/netlink/route/tc-api.h
+++ b/include/netlink-private/route/tc-api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/route/tc-api.h      Traffic Control API
+ * netlink-private/route/tc-api.h      Traffic Control API
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2011-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_TC_API_H_
@@ -20,8 +20,6 @@
 extern "C" {
 #endif
 
-#define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
-
 /**
  * Traffic control object operations
  * @ingroup tc

diff --git a/include/netlink-tc.h b/include/netlink-private/tc.h
similarity index 88%
rename from include/netlink-tc.h
rename to include/netlink-private/tc.h
index 3e44642922d7ee5a5a63d42386c41f2c7c088080..182adaa8883a0ead4df33b17df94ce95c4292634 100644 (file)
--- a/include/netlink-tc.h
+++ b/include/netlink-private/tc.h
@@ -1,18 +1,18 @@
 /*
- * netlink-tc.h                Local Traffic Control Interface
+ * netlink-private/tc.h                Local Traffic Control Interface
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_TC_PRIV_H_
 #define NETLINK_TC_PRIV_H_
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/netlink-types.h b/include/netlink-private/types.h
similarity index 99%
rename from include/netlink-types.h
rename to include/netlink-private/types.h
index 46856a39509052b71eaf885855f3796110b7e077..60a3bceb0dada9229ebd00561450344f50591506 100644 (file)
--- a/include/netlink-types.h
+++ b/include/netlink-private/types.h
@@ -1,12 +1,12 @@
 /*
- * netlink-types.h     Netlink Types (Private)
+ * netlink-private/types.h     Netlink Types (Private)
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2012 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_LOCAL_TYPES_H_
@@ -17,7 +17,7 @@
 #include <netlink/route/qdisc.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/route.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 
 #define NL_SOCK_BUFSIZE_SET    (1<<0)
 #define NL_SOCK_PASSCRED       (1<<1)

diff --git a/include/netlink/route/link/info-api.h b/include/netlink/route/link/info-api.h
deleted file mode 100644 (file)
index 4750e18..0000000
--- a/include/netlink/route/link/info-api.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * netlink/route/link/info-api.h       Link Info API
- *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation version 2.1
- *     of the License.
- *
- * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
- */
-
-#ifndef NETLINK_LINK_INFO_API_H_
-#define NETLINK_LINK_INFO_API_H_
-
-#warning "<netlink/route/link/info-api.h> is obsolete and may be removed in the future."
-#warning "include <netlink/route/link/api.h> instead.
-
-#include <netlink/route/link/api.h>
-
-#endif

diff --git a/include/netlink/route/tc.h b/include/netlink/route/tc.h
index caee60c99a035ae79010a2bcc5f007c09fd7b21e..836f7b1c792710a04e3a396b35dc63940a86aa39 100644 (file)
--- a/include/netlink/route/tc.h
+++ b/include/netlink/route/tc.h
@@ -30,6 +30,8 @@ enum rtnl_tc_type {
        __RTNL_TC_TYPE_MAX,
 };
 
+#define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
+
 /**
  * Compute tc handle based on major and minor parts
  * @ingroup tc

diff --git a/lib/addr.c b/lib/addr.c
index 1f1478acc4936a17a272ebec8a9a7678b557bc3e..806664b0f3ae5e0a0c3754e89857ef4ac5516f23 100644 (file)
--- a/lib/addr.c
+++ b/lib/addr.c
@@ -27,7 +27,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/addr.h>

diff --git a/lib/attr.c b/lib/attr.c
index 1601061f5a6863fac2911913efa837ba83c05ac3..10ea682d2c648f0b305f59522e0a82fb652fdc63 100644 (file)
--- a/lib/attr.c
+++ b/lib/attr.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/addr.h>

diff --git a/lib/cache.c b/lib/cache.c
index 24ffa31f21af267be3ba9b8daeed246a1e34c3ac..fafc0231aec7c458a07f18f5119ebde68a089f3e 100644 (file)
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -49,7 +49,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/object.h>

diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c
index d5dc1f3bc8cc160f3f4502f76874045db6a7bc53..f8a65e347d6ae8e1e57555cc37f5efe12516eb27 100644 (file)
--- a/lib/cache_mngr.c
+++ b/lib/cache_mngr.c
@@ -32,7 +32,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>

diff --git a/lib/cache_mngt.c b/lib/cache_mngt.c
index 62cde0694b082e86712f84ca5223f8075d3d0a2d..4d3d6ff6d46f568d1b31b27b0fa2fb068857ff12 100644 (file)
--- a/lib/cache_mngt.c
+++ b/lib/cache_mngt.c
@@ -25,7 +25,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>

diff --git a/lib/data.c b/lib/data.c
index f019539c6b0b4e7f7c22b04b54277e3ff876aa63..1a3a3fbd1f702ef80b2eaac5d931f061309ddb23 100644 (file)
--- a/lib/data.c
+++ b/lib/data.c
@@ -27,7 +27,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <linux/socket.h>

diff --git a/lib/error.c b/lib/error.c
index e8ee47459ee753c8d884c73c1ba2d0773707a8e6..f30b9a598434d1e66fbf5537e72b75db1553a4da 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2008 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 
 static const char *errmsg[NLE_MAX+1] = {

diff --git a/lib/fib_lookup/lookup.c b/lib/fib_lookup/lookup.c
index ec82c1689e042177f4e8dcd5803f5c76344212ee..6fe8daeb0b81d1218f6f64624f38dd95dd9c6553 100644 (file)
--- a/lib/fib_lookup/lookup.c
+++ b/lib/fib_lookup/lookup.c
@@ -16,7 +16,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>

diff --git a/lib/fib_lookup/request.c b/lib/fib_lookup/request.c
index ffcf8f5d6b4f7c1f36d8e01a309c0f2d15824ff3..1b021b64dba8fe5f537cbc7f0c02fdcf22aa7427 100644 (file)
--- a/lib/fib_lookup/request.c
+++ b/lib/fib_lookup/request.c
@@ -16,7 +16,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.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 057a1bfdd4884b9428b9f67c283430e2de7ef7ec..c6db7423c3933e8cf80b6457068275b73e57bdab 100644 (file)
--- a/lib/genl/ctrl.c
+++ b/lib/genl/ctrl.c
@@ -21,7 +21,7 @@
  * @{
  */
 
-#include <netlink-generic.h>
+#include <netlink-private/genl.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 05e45ac0b523abb87d0daaa005fe591cf3368a4b..897c809e6ab89e8a9937b193d2ed9c6d8fba5357 100644 (file)
--- a/lib/genl/family.c
+++ b/lib/genl/family.c
@@ -18,7 +18,7 @@
  * @{
  */
 
-#include <netlink-generic.h>
+#include <netlink-private/genl.h>
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>

diff --git a/lib/genl/genl.c b/lib/genl/genl.c
index 8d3def36e67cf085e803478bd94bd49f597a2403..0c9b11eb568311643058cfe3a11eb430bb0e69b3 100644 (file)
--- a/lib/genl/genl.c
+++ b/lib/genl/genl.c
@@ -15,7 +15,7 @@
  * @{
  */
 
-#include <netlink-generic.h>
+#include <netlink-private/genl.h>
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/utils.h>

diff --git a/lib/genl/mngt.c b/lib/genl/mngt.c
index ad25172b5e1d6ba578ebbbe0aea15582d95fc628..a3faaf23ebf93ba16b0af0ea9de0d72551fab09f 100644 (file)
--- a/lib/genl/mngt.c
+++ b/lib/genl/mngt.c
@@ -18,7 +18,7 @@
  * @{
  */
 
-#include <netlink-generic.h>
+#include <netlink-private/genl.h>
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/mngt.h>

diff --git a/lib/handlers.c b/lib/handlers.c
index 74276a19ebb2515e33b4e3ad6d8fb924957e3022..ee1376b03a245acb0efd2e7f86ecf38bf75ead9e 100644 (file)
--- a/lib/handlers.c
+++ b/lib/handlers.c
@@ -25,7 +25,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/msg.h>

diff --git a/lib/hashtable.c b/lib/hashtable.c
index ecd57306bf9b279fa5c469fab0df6118d96723f7..8b1592515f6a5476fa650938fd64694a2134de92 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2012 Cumulus Networks, Inc
  */
 #include <string.h>
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/object.h>
 #include <netlink/hash.h>
 #include <netlink/hashtable.h>

diff --git a/lib/msg.c b/lib/msg.c
index 2613c78145eb7a5f6b248129801cc114c9179e24..8198ded2c9fc12a7cc4247cc4e8892ee83d3dbf2 100644 (file)
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -26,7 +26,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/cache.h>

diff --git a/lib/netfilter/ct.c b/lib/netfilter/ct.c
index 59ee1d950479fb3c683807ee75f6cbf1c927126f..5dde1d1588f5416b081a2f5daf2bb4f499bffa6d 100644 (file)
--- a/lib/netfilter/ct.c
+++ b/lib/netfilter/ct.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_conntrack.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/ct.h>

diff --git a/lib/netfilter/ct_obj.c b/lib/netfilter/ct_obj.c
index 4686170fe28da5c2e6fd93702b1a64eb28719b7a..bac775bfd6296a622122fd829e6e6014f5ee5340 100644 (file)
--- a/lib/netfilter/ct_obj.c
+++ b/lib/netfilter/ct_obj.c
@@ -16,7 +16,7 @@
 #include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/ct.h>
 

diff --git a/lib/netfilter/exp.c b/lib/netfilter/exp.c
index 5ba2bcb08a169ab130de1fce8d59ae1043abf232..952ef3a77e0f98133f851000689fcfec0520e7c3 100644 (file)
--- a/lib/netfilter/exp.c
+++ b/lib/netfilter/exp.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_conntrack.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/exp.h>

diff --git a/lib/netfilter/exp_obj.c b/lib/netfilter/exp_obj.c
index 182df2358b2f4bc374c320424928ae82fb0d9221..69b4dd31597911cb6c13cfa88ee50e80605d0b44 100644 (file)
--- a/lib/netfilter/exp_obj.c
+++ b/lib/netfilter/exp_obj.c
@@ -18,7 +18,7 @@
 #include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/exp.h>
 

diff --git a/lib/netfilter/log.c b/lib/netfilter/log.c
index 96ae6c51ee8cfc7800319376b20d0d17cb820e8c..1bab9b6b8d3c4b8e78d4a60aa79bf904a7110d84 100644 (file)
--- a/lib/netfilter/log.c
+++ b/lib/netfilter/log.c
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_log.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log.h>

diff --git a/lib/netfilter/log_msg.c b/lib/netfilter/log_msg.c
index 65448f97397d0ee38aefd77929d50cb926c8d790..6e09da2ca83895a3c7f72a5af2da9065381b78b4 100644 (file)
--- a/lib/netfilter/log_msg.c
+++ b/lib/netfilter/log_msg.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_log.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log_msg.h>

diff --git a/lib/netfilter/log_msg_obj.c b/lib/netfilter/log_msg_obj.c
index d2ad0ff3852e4e0447965230b339e25780a0f426..57db9d47ff0c33423f15a2088f0d1fa6e9b568b4 100644 (file)
--- a/lib/netfilter/log_msg_obj.c
+++ b/lib/netfilter/log_msg_obj.c
@@ -11,7 +11,7 @@
  * Copyright (c) 2007 Secure Computing Corporation
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.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 43c4a06b5c59fd90851b8095eb0fa837348ec407..2b114142368acd8d9724bd7652e4211e5f0aea73 100644 (file)
--- a/lib/netfilter/log_obj.c
+++ b/lib/netfilter/log_obj.c
@@ -12,7 +12,7 @@
  * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log.h>
 

diff --git a/lib/netfilter/netfilter.c b/lib/netfilter/netfilter.c
index addecd735b1ed5a75ff0809f3837ab1b62af495c..0062994f78060315c9a0818b1d972e96bf0aaecd 100644 (file)
--- a/lib/netfilter/netfilter.c
+++ b/lib/netfilter/netfilter.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netfilter/netfilter.h>
 #include <linux/netfilter.h>
 

diff --git a/lib/netfilter/nfnl.c b/lib/netfilter/nfnl.c
index 6d27c444d412e9ee0499eab4a127c4f310b765db..f028a859217f04c2634b6ee598edbe174022360c 100644 (file)
--- a/lib/netfilter/nfnl.c
+++ b/lib/netfilter/nfnl.c
@@ -61,7 +61,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 

diff --git a/lib/netfilter/queue.c b/lib/netfilter/queue.c
index ff1de0e07f24ab57fe9c3c1b73610aedd0eb25bb..565564792cd705e424c689fd53a84c8887f11d4c 100644 (file)
--- a/lib/netfilter/queue.c
+++ b/lib/netfilter/queue.c
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_queue.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue.h>

diff --git a/lib/netfilter/queue_msg.c b/lib/netfilter/queue_msg.c
index 30c522fb2fb8a6a4289661870d151fd250b2d05f..95d8ad3b7a3d682d95d9915ec9776ab21b0458de 100644 (file)
--- a/lib/netfilter/queue_msg.c
+++ b/lib/netfilter/queue_msg.c
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <linux/netfilter/nfnetlink_queue.h>
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue_msg.h>

diff --git a/lib/netfilter/queue_msg_obj.c b/lib/netfilter/queue_msg_obj.c
index bfaafc54810ae098dcca612946292db17718cd50..8085f1b3d5c107eaa73b56107da2beabd65d58b1 100644 (file)
--- a/lib/netfilter/queue_msg_obj.c
+++ b/lib/netfilter/queue_msg_obj.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2007, 2008 Patrick McHardy <kaber@trash.net>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/netfilter.h>
 #include <netlink/netfilter/queue_msg.h>

diff --git a/lib/netfilter/queue_obj.c b/lib/netfilter/queue_obj.c
index 05a9cb89fc0782538709b471d868603186819dd1..5edcc684cee2028b213a3c9a79c5e8d927cf25bb 100644 (file)
--- a/lib/netfilter/queue_obj.c
+++ b/lib/netfilter/queue_obj.c
@@ -16,7 +16,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue.h>
 

diff --git a/lib/nl.c b/lib/nl.c
index ec1db01709ad071c0c1aff60f90f51259a35baaa..fa43c56ca161d1e21e1b793cf00f6aca9241a924 100644 (file)
--- a/lib/nl.c
+++ b/lib/nl.c
@@ -25,7 +25,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/handlers.h>

diff --git a/lib/object.c b/lib/object.c
index 7361194e40a2febe11631a107f97dce175dd479e..17b98f6b38b54eb00165988cb96520c413335bd2 100644 (file)
--- a/lib/object.c
+++ b/lib/object.c
@@ -27,7 +27,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/object.h>

diff --git a/lib/route/addr.c b/lib/route/addr.c
index c5e14bbf789ab7f5e516e9437c5533bfde6c52e4..95a9447dff66d2ce77830f3b0b85d73da463c364 100644 (file)
--- a/lib/route/addr.c
+++ b/lib/route/addr.c
@@ -106,7 +106,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/addr.h>

diff --git a/lib/route/class.c b/lib/route/class.c
index 399e8a2c7528207d2caa7d82abc27aa414feb15a..050f42a14113bca063108cade51c1afb3222c413 100644 (file)
--- a/lib/route/class.c
+++ b/lib/route/class.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -15,10 +15,10 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/class.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/classifier.h>

diff --git a/lib/route/classid.c b/lib/route/classid.c
index 255e0750e74db75b650008fea7ff54ac8b5ac60a..f2d3a01c2729cefa449591514f00533e6f4a3931 100644 (file)
--- a/lib/route/classid.c
+++ b/lib/route/classid.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -15,8 +15,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/tc.h>

diff --git a/lib/route/cls.c b/lib/route/cls.c
index 35a010a70c76e40dc9133be8663d1b06193dbbef..7a809bb5751af977c6d1a3c4d836a36ed2d3c66d 100644 (file)
--- a/lib/route/cls.c
+++ b/lib/route/cls.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -15,11 +15,11 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/link.h>
 

diff --git a/lib/route/cls/basic.c b/lib/route/cls/basic.c
index 9d7710addaef773d76b2e88821df9a693adf56bb..fb1c38208d00288d3700c2b0c12f4778b586f4e2 100644 (file)
--- a/lib/route/cls/basic.c
+++ b/lib/route/cls/basic.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2008-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -22,10 +22,10 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/basic.h>
 #include <netlink/route/cls/ematch.h>

diff --git a/lib/route/cls/cgroup.c b/lib/route/cls/cgroup.c
index 230863b16ed43501b5f9e7306ec007d3f857a1e3..c5b75612ff78bdf9ca3f03d8ba7a7e21c6b01538 100644 (file)
--- a/lib/route/cls/cgroup.c
+++ b/lib/route/cls/cgroup.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2009-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2009-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -16,12 +16,12 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/cgroup.h>
 #include <netlink/route/cls/ematch.h>

diff --git a/lib/route/cls/ematch.c b/lib/route/cls/ematch.c
index 8c9c3ddc5094fc00062a14961a3bebe359cb1552..89b5067109b61e61db12edea8d568004ec20505a 100644 (file)
--- a/lib/route/cls/ematch.c
+++ b/lib/route/cls/ematch.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -16,8 +16,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/ematch.h>

diff --git a/lib/route/cls/ematch/cmp.c b/lib/route/cls/ematch/cmp.c
index 2a1070a3d5b9445bba000400f6f44ea0be4fc2a9..2997cdbc72e19a19c7f9cc7d407d3b52fd3aeb53 100644 (file)
--- a/lib/route/cls/ematch/cmp.c
+++ b/lib/route/cls/ematch/cmp.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -16,8 +16,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <linux/tc_ematch/tc_em_cmp.h>

diff --git a/lib/route/cls/ematch/container.c b/lib/route/cls/ematch/container.c
index 6d73ab683d21712fbd80938dcc0abbce7efcbe5e..813391ab5715ab44ca956d022f7e95ab6cb81929 100644 (file)
--- a/lib/route/cls/ematch/container.c
+++ b/lib/route/cls/ematch/container.c
@@ -6,11 +6,11 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 

diff --git a/lib/route/cls/ematch/meta.c b/lib/route/cls/ematch/meta.c
index 11f87d6c96616b592b57b1fb453290792c097137..44f11b92a227abba4c9c03949370cb2142f02272 100644 (file)
--- a/lib/route/cls/ematch/meta.c
+++ b/lib/route/cls/ematch/meta.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -16,8 +16,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/meta.h>

diff --git a/lib/route/cls/ematch/nbyte.c b/lib/route/cls/ematch/nbyte.c
index 25a986694764ac14ddabbc76bcec231824ce7f13..88524893b891819c29b468e52017186b723d7519 100644 (file)
--- a/lib/route/cls/ematch/nbyte.c
+++ b/lib/route/cls/ematch/nbyte.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -16,8 +16,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/nbyte.h>

diff --git a/lib/route/cls/ematch/text.c b/lib/route/cls/ematch/text.c
index 9d0241e47835615132130b413a03cdad907faa05..e8cdcaecb754212359f080c3ae6cc04077344f2b 100644 (file)
--- a/lib/route/cls/ematch/text.c
+++ b/lib/route/cls/ematch/text.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -16,8 +16,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/route/cls/ematch.h>
 #include <netlink/route/cls/ematch/text.h>

diff --git a/lib/route/cls/ematch_grammar.l b/lib/route/cls/ematch_grammar.l
index 07e7e8c6aab8fc061c239ec8d70bf8b6896d8807..96ef1a0bfc6f2c8d98c70fbc124a7d013522698d 100644 (file)
--- a/lib/route/cls/ematch_grammar.l
+++ b/lib/route/cls/ematch_grammar.l
@@ -6,12 +6,12 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 %{
- #include <netlink-local.h>
- #include <netlink-tc.h>
+ #include <netlink-private/netlink.h>
+ #include <netlink-private/tc.h>
  #include <netlink/netlink.h>
  #include <netlink/route/cls/ematch.h>
  #include <netlink/route/cls/ematch/cmp.h>

diff --git a/lib/route/cls/ematch_syntax.y b/lib/route/cls/ematch_syntax.y
index 39123be9d824552fa0ff44845c5806367b7049cf..da2103928e55cc9821f8d38eed63324b6f6272f4 100644 (file)
--- a/lib/route/cls/ematch_syntax.y
+++ b/lib/route/cls/ematch_syntax.y
@@ -6,12 +6,12 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 %{
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/pktloc.h>

diff --git a/lib/route/cls/fw.c b/lib/route/cls/fw.c
index d24779acbfc680d844f5eb04d2b4c3b572ae4ac0..b569d4f0c9704ebff3e37309cb5fd03f2423f094 100644 (file)
--- a/lib/route/cls/fw.c
+++ b/lib/route/cls/fw.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  * Copyright (c) 2006 Petr Gotthard <petr.gotthard@siemens.com>
  * Copyright (c) 2006 Siemens AG Oesterreich
  */
@@ -18,10 +18,10 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/fw.h>
 

diff --git a/lib/route/cls/police.c b/lib/route/cls/police.c
index d7ab26b89342ff639f78c7623319405d823d5baa..1f5d2844ff2012d86dd87b911ee1a4fa07ae7248 100644 (file)
--- a/lib/route/cls/police.c
+++ b/lib/route/cls/police.c
@@ -6,14 +6,14 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/police.h>
 

diff --git a/lib/route/cls/u32.c b/lib/route/cls/u32.c
index aa9eb77d04183cd9750216d9b497b801b8249102..c468ba726824cb4c476a0c3a8ee413244f27d2b7 100644 (file)
--- a/lib/route/cls/u32.c
+++ b/lib/route/cls/u32.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  * Copyright (c) 2005-2006 Petr Gotthard <petr.gotthard@siemens.com>
  * Copyright (c) 2005-2006 Siemens AG Oesterreich
  */
@@ -18,12 +18,12 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/classifier.h>
 #include <netlink/route/cls/u32.h>
 

diff --git a/lib/route/link.c b/lib/route/link.c
index f817b3a52b18202edf20708f56df22d326193326..317151371a8ea259b79bc15ddcc1857d24f12501 100644 (file)
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -18,7 +18,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/utils.h>
@@ -26,7 +26,7 @@
 #include <netlink/hashtable.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 /** @cond SKIP */
 #define LINK_ATTR_MTU          (1 <<  0)

diff --git a/lib/route/link/api.c b/lib/route/link/api.c
index 392ded3004718cbb2738f4706f2faf0f12ab826e..63ff99ca43b4d9fb50a72573726c25ee3f71d1df 100644 (file)
--- a/lib/route/link/api.c
+++ b/lib/route/link/api.c
@@ -39,11 +39,11 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/link.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 static NL_LIST_HEAD(info_ops);
 

diff --git a/lib/route/link/bonding.c b/lib/route/link/bonding.c
index 5e78084e84ac167adc6d242ee8de656da6c696ff..b060ee1c6a552174927cb0cae14dbb99fa5bf756 100644 (file)
--- a/lib/route/link/bonding.c
+++ b/lib/route/link/bonding.c
@@ -20,9 +20,9 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 /**
  * Create a new kernel bonding device

diff --git a/lib/route/link/bridge.c b/lib/route/link/bridge.c
index cd9f462dfc17fcd400f8f2193d10dcdad9c828ec..52beedd9751a07c1abd95b88c145543e36401fd5 100644 (file)
--- a/lib/route/link/bridge.c
+++ b/lib/route/link/bridge.c
@@ -9,11 +9,11 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 #define BRIDGE_ATTR_PORT_STATE 0x0001
 

diff --git a/lib/route/link/can.c b/lib/route/link/can.c
index 4b80d94ccb18fb6251df91338e2de913506f20c9..76bfa1ae4fac465dc943d1de5f3815a74e74e66c 100644 (file)
--- a/lib/route/link/can.c
+++ b/lib/route/link/can.c
@@ -22,13 +22,13 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.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/api.h>
+#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/can.h>
 
 #include <linux/can/netlink.h>

diff --git a/lib/route/link/dummy.c b/lib/route/link/dummy.c
index c7dabc19f66ac2a33d6cd437ed824a4cfc2bd4f1..1fd9f5a30ee75990c91365e9a2e592b0b6485ff6 100644 (file)
--- a/lib/route/link/dummy.c
+++ b/lib/route/link/dummy.c
@@ -19,9 +19,9 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 static struct rtnl_link_info_ops dummy_info_ops = {
        .io_name                = "dummy",

diff --git a/lib/route/link/inet.c b/lib/route/link/inet.c
index a0e2318633819c323d521dceb44ab2f015c96020..e2c867d11f2e47988515eb3233a60c17cd9db2fd 100644 (file)
--- a/lib/route/link/inet.c
+++ b/lib/route/link/inet.c
@@ -57,11 +57,11 @@
  */
 
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 /** @cond SKIP */
 struct inet_data

diff --git a/lib/route/link/inet6.c b/lib/route/link/inet6.c
index 9ee82261df80b05533f969365e26ada191298f52..4c627bd8b1ae3983ff9285a6e29b371f3ed983db 100644 (file)
--- a/lib/route/link/inet6.c
+++ b/lib/route/link/inet6.c
@@ -9,11 +9,11 @@
  * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
 
 struct inet6_data
 {

diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c
index a9bf955fe0f8edabe8622439696b932d7261ff3c..4f44aa55b9a717a574ef8a2373ed8b1dd9a743cf 100644 (file)
--- a/lib/route/link/vlan.c
+++ b/lib/route/link/vlan.c
@@ -22,13 +22,13 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.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/api.h>
+#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/vlan.h>
 
 #include <linux/if_vlan.h>

diff --git a/lib/route/neigh.c b/lib/route/neigh.c
index 4a85a851cf6fb6f61f4426e1edbc34a4844cb359..c0f80a26189d5e7b23844886439fc9c0d2f9f649 100644 (file)
--- a/lib/route/neigh.c
+++ b/lib/route/neigh.c
@@ -148,7 +148,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/hashtable.h>

diff --git a/lib/route/neightbl.c b/lib/route/neightbl.c
index 509617b97b9bb9ed65623d193ee1faaea015a811..f9c9c27759e02cc91d54f378a8c6f2a5b10e9ad7 100644 (file)
--- a/lib/route/neightbl.c
+++ b/lib/route/neightbl.c
@@ -16,7 +16,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>

diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c
index 9990c51271b55bd845f3629319785b0065dce23b..d3ca4991041e86168057bab7bc3b051b49fb6b0e 100644 (file)
--- a/lib/route/nexthop.c
+++ b/lib/route/nexthop.c
@@ -15,7 +15,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>

diff --git a/lib/route/pktloc.c b/lib/route/pktloc.c
index 70d552ba5c54e5b62dc964cd84c40886f22d5e0f..9fcf4a4c11d16dcc4efe76361716f24034886445 100644 (file)
--- a/lib/route/pktloc.c
+++ b/lib/route/pktloc.c
@@ -6,7 +6,7 @@
  *     License as published by the Free Software Foundation version 2.1
  *     of the License.
  *
- * Copyright (c) 2008-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
@@ -31,8 +31,8 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/pktloc.h>

diff --git a/lib/route/pktloc_grammar.l b/lib/route/pktloc_grammar.l
index 6b7a9339617ec1105350405b0da4a467356b0416..cbb42b3822d493c4a389b623dc7c991e4c3760e0 100644 (file)
--- a/lib/route/pktloc_grammar.l
+++ b/lib/route/pktloc_grammar.l
@@ -1,6 +1,6 @@
 %{
- #include <netlink-local.h>
- #include <netlink-tc.h>
+ #include <netlink-private/netlink.h>
+ #include <netlink-private/tc.h>
  #include <netlink/netlink.h>
  #include <netlink/utils.h>
  #include <netlink/route/pktloc.h>

diff --git a/lib/route/pktloc_syntax.y b/lib/route/pktloc_syntax.y
index 4a2ce48d7c377ac40316e49072a1a9cf7861ea46..25d87109b6bbba6325ebdbfbd9ca32b03a30a083 100644 (file)
--- a/lib/route/pktloc_syntax.y
+++ b/lib/route/pktloc_syntax.y
@@ -1,6 +1,6 @@
 %{
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/pktloc.h>

diff --git a/lib/route/qdisc.c b/lib/route/qdisc.c
index 3d618c6b5aabcb68681daa13d67ef904b8ba4924..250d191aa62b31468d89a0b3015c962a05cd73fd 100644 (file)
--- a/lib/route/qdisc.c
+++ b/lib/route/qdisc.c
@@ -15,12 +15,12 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/link.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/classifier.h>

diff --git a/lib/route/qdisc/blackhole.c b/lib/route/qdisc/blackhole.c
index 06f538022a31d3e10f5e838ac73709b8a5281bec..339cf7819df333475ed61c18d9c56cf17dc072a4 100644 (file)
--- a/lib/route/qdisc/blackhole.c
+++ b/lib/route/qdisc/blackhole.c
@@ -15,9 +15,9 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 
 static struct rtnl_tc_ops blackhole_ops = {
        .to_kind                = "blackhole",

diff --git a/lib/route/qdisc/cbq.c b/lib/route/qdisc/cbq.c
index e791a101755062709a64861a0e3a2bf734ed01e1..95f1761872423c06d1a732eb8aa3bab8dff110cd 100644 (file)
--- a/lib/route/qdisc/cbq.c
+++ b/lib/route/qdisc/cbq.c
@@ -9,11 +9,11 @@
  * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/link.h>

diff --git a/lib/route/qdisc/dsmark.c b/lib/route/qdisc/dsmark.c
index b5fd0d6e5a8a2377c07d420500e9a49da1f805bc..fd9553dc84ee1749d8bc171b00a9b2e691591b7c 100644 (file)
--- a/lib/route/qdisc/dsmark.c
+++ b/lib/route/qdisc/dsmark.c
@@ -16,12 +16,12 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/class.h>
 #include <netlink/route/qdisc/dsmark.h>
 

diff --git a/lib/route/qdisc/fifo.c b/lib/route/qdisc/fifo.c
index e87c79a5964e317a805d9547f3e9330c341aacb5..d94c0079efd7c67f96dbcc44088f66b42259474e 100644 (file)
--- a/lib/route/qdisc/fifo.c
+++ b/lib/route/qdisc/fifo.c
@@ -29,10 +29,10 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/fifo.h>
 #include <netlink/utils.h>

diff --git a/lib/route/qdisc/htb.c b/lib/route/qdisc/htb.c
index 9fb0bf63563a5e851f2f6623c2c72874e7d45f8d..5a61a4ea1d1d0abc31458d379c4929fb7fe3706d 100644 (file)
--- a/lib/route/qdisc/htb.c
+++ b/lib/route/qdisc/htb.c
@@ -18,12 +18,12 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/link.h>

diff --git a/lib/route/qdisc/netem.c b/lib/route/qdisc/netem.c
index ddd404d6bbd7955974e84bb13d151f91a6a286aa..06d9fe8c46675f8dcf8357d0d6e9b05904f435d7 100644 (file)
--- a/lib/route/qdisc/netem.c
+++ b/lib/route/qdisc/netem.c
@@ -18,11 +18,11 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/netem.h>
 

diff --git a/lib/route/qdisc/plug.c b/lib/route/qdisc/plug.c
index a99b9bed80cc41b9b5022a716a2997d0b2c11143..9f536375e9836c7aca1d2e485fbf31561f3c2a9d 100644 (file)
--- a/lib/route/qdisc/plug.c
+++ b/lib/route/qdisc/plug.c
@@ -60,11 +60,11 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc/plug.h>
 
 static int plug_msg_fill(struct rtnl_tc *tc, void *data, struct nl_msg *msg)

diff --git a/lib/route/qdisc/prio.c b/lib/route/qdisc/prio.c
index 2433c61e712d8736a7a2e542068307a4c262905b..54a46f01ba5a2b4ec67139e41d74f575437fae19 100644 (file)
--- a/lib/route/qdisc/prio.c
+++ b/lib/route/qdisc/prio.c
@@ -26,11 +26,11 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/prio.h>
 

diff --git a/lib/route/qdisc/red.c b/lib/route/qdisc/red.c
index 0480282a5f2d9e2028d946cde92f1f71072b6183..f05626ebae0a56753794a53b7ff7748a820ca8ab 100644 (file)
--- a/lib/route/qdisc/red.c
+++ b/lib/route/qdisc/red.c
@@ -16,11 +16,11 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/red.h>
 

diff --git a/lib/route/qdisc/sfq.c b/lib/route/qdisc/sfq.c
index 207140ff880ff38cfaa909a8c2e176c08fc5e129..acbb4ef843f032735390b4f21c63fa55755eb5b8 100644 (file)
--- a/lib/route/qdisc/sfq.c
+++ b/lib/route/qdisc/sfq.c
@@ -23,11 +23,11 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/qdisc/sfq.h>
 

diff --git a/lib/route/qdisc/tbf.c b/lib/route/qdisc/tbf.c
index a115548a2a76e4f5aa5286c7a230e55d885a8da5..eb574d957c0e3e1cbca913f3d091446d58fc4d82 100644 (file)
--- a/lib/route/qdisc/tbf.c
+++ b/lib/route/qdisc/tbf.c
@@ -15,12 +15,12 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/link.h>

diff --git a/lib/route/route.c b/lib/route/route.c
index 2218a604dad5e3afba02641dca27659498e1c0ae..29851873c09b48b4c02e1918ea4aa0ed30684f22 100644 (file)
--- a/lib/route/route.c
+++ b/lib/route/route.c
@@ -16,7 +16,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>

diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index 0c472b76b7582c00a046069dced78ffe01e1dbbc..8f1e5155913a2501a4f39dfe8ee4a345bad33aa8 100644 (file)
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -30,7 +30,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>

diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
index 8b73f2baffaa3a660319560acace4ca1af9df659..a5b3966197241ed97143200a9edac386954da5d2 100644 (file)
--- a/lib/route/route_utils.c
+++ b/lib/route/route_utils.c
@@ -37,7 +37,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>

diff --git a/lib/route/rtnl.c b/lib/route/rtnl.c
index 12a7e97f3cf2f1c8c9d6d10ee0c4a2994206dfaf..82397e9ef0a4b73724859fe7ad7ee409c4819af3 100644 (file)
--- a/lib/route/rtnl.c
+++ b/lib/route/rtnl.c
@@ -14,7 +14,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>

diff --git a/lib/route/rule.c b/lib/route/rule.c
index 076ca5115357facde5667d5c68fb7900e0bbc6df..b2161a2e9bdbba05d33c418cc8fbd6f62c20145e 100644 (file)
--- a/lib/route/rule.c
+++ b/lib/route/rule.c
@@ -16,7 +16,7 @@
  * @{
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>

diff --git a/lib/route/tc.c b/lib/route/tc.c
index 5a0b7839f26c21b45db3a74f895b3c6f57fcbaba..29954fd8f6c93ff170133c921706be17b9a71d1a 100644 (file)
--- a/lib/route/tc.c
+++ b/lib/route/tc.c
@@ -15,14 +15,14 @@
  * @{
  */
 
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.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/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 
 /** @cond SKIP */
 

diff --git a/lib/socket.c b/lib/socket.c
index b30058be8152a1d16795751b3dbacc482f089549..d3e636eca98fb2b180c74a2d7a37b27b4a0fb28e 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -29,7 +29,7 @@
 
 #include "defs.h"
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/handlers.h>

diff --git a/lib/utils.c b/lib/utils.c
index 551118914d6d68e5bfea0530390fbc70bae08f82..3bfa60441b75c493efffc578af31b52eae7d437f 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -24,7 +24,7 @@
  * ~~~~
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <linux/socket.h>

diff --git a/src/lib/tc.c b/src/lib/tc.c
index 26124f1c95284600df8b68c886a6559129f82d77..dde729faa6beb01ffc8d96e09919a659958ef8d5 100644 (file)
--- a/src/lib/tc.c
+++ b/src/lib/tc.c
@@ -11,7 +11,7 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 
 /**
  * @ingroup cli

diff --git a/src/nl-list-caches.c b/src/nl-list-caches.c
index 14cbab185763132ae152d1c114eff56fb2f803a3..853d8a40ea82699ae326f903f50d48ec9a57609f 100644 (file)
--- a/src/nl-list-caches.c
+++ b/src/nl-list-caches.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
  */
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/cli/utils.h>
 
 static void print_usage(void)