diff --git a/include/Makefile.am b/include/Makefile.am
index 50d1e4e..50f96b7 100644
--- 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 493a551..5d9b0ad 100644
--- 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 10aa2f0..0aca6d7 100644
--- 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 c0915f8..6ae6d17 100644
--- 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 ae6180a..f4fd71e 100644
--- 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 28f2464..bb98ccc 100644
--- 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 601a8df..bf0c8a3 100644
--- 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 3e44642..182adaa 100644
--- 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 46856a3..60a3bce 100644
--- 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
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 caee60c..836f7b1 100644
--- 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 1f1478a..806664b 100644
--- 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 1601061..10ea682 100644
--- 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 24ffa31..fafc023 100644
--- 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 d5dc1f3..f8a65e3 100644
--- 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 62cde06..4d3d6ff 100644
--- 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 f019539..1a3a3fb 100644
--- 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 e8ee474..f30b9a5 100644
--- 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 ec82c16..6fe8dae 100644
--- 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 ffcf8f5..1b021b6 100644
--- 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 057a1bf..c6db742 100644
--- 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 05e45ac..897c809 100644
--- 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 8d3def3..0c9b11e 100644
--- 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 ad25172..a3faaf2 100644
--- 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 74276a1..ee1376b 100644
--- 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 ecd5730..8b15925 100644
--- 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 2613c78..8198ded 100644
--- 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 59ee1d9..5dde1d1 100644
--- 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 4686170..bac775b 100644
--- 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 5ba2bcb..952ef3a 100644
--- 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 182df23..69b4dd3 100644
--- 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 96ae6c5..1bab9b6 100644
--- 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 65448f9..6e09da2 100644
--- 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 d2ad0ff..57db9d4 100644
--- 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 43c4a06..2b11414 100644
--- 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 addecd7..0062994 100644
--- 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 6d27c44..f028a85 100644
--- 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 ff1de0e..5655647 100644
--- 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 30c522f..95d8ad3 100644
--- 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 bfaafc5..8085f1b 100644
--- 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 05a9cb8..5edcc68 100644
--- 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 ec1db01..fa43c56 100644
--- 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 7361194..17b98f6 100644
--- 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 c5e14bb..95a9447 100644
--- 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 399e8a2..050f42a 100644
--- 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 255e075..f2d3a01 100644
--- 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 35a010a..7a809bb 100644
--- 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 9d7710a..fb1c382 100644
--- 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 230863b..c5b7561 100644
--- 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 8c9c3dd..89b5067 100644
--- 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 2a1070a..2997cdb 100644
--- 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 6d73ab6..813391a 100644
--- 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 11f87d6..44f11b9 100644
--- 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 25a9866..8852489 100644
--- 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 9d0241e..e8cdcae 100644
--- 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 07e7e8c..96ef1a0 100644
--- 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 39123be..da21039 100644
--- 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 d24779a..b569d4f 100644
--- 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 d7ab26b..1f5d284 100644
--- 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 aa9eb77..c468ba7 100644
--- 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 f817b3a..3171513 100644
--- 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 392ded3..63ff99c 100644
--- 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 5e78084..b060ee1 100644
--- 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 cd9f462..52beedd 100644
--- 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 4b80d94..76bfa1a 100644
--- 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 c7dabc1..1fd9f5a 100644
--- 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 a0e2318..e2c867d 100644
--- 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 9ee8226..4c627bd 100644
--- 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 a9bf955..4f44aa5 100644
--- 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 4a85a85..c0f80a2 100644
--- 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 509617b..f9c9c27 100644
--- 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 9990c51..d3ca499 100644
--- 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 70d552b..9fcf4a4 100644
--- 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 6b7a933..cbb42b3 100644
--- 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 4a2ce48..25d8710 100644
--- 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 3d618c6..250d191 100644
--- 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 06f5380..339cf78 100644
--- 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 e791a10..95f1761 100644
--- 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 b5fd0d6..fd9553d 100644
--- 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 e87c79a..d94c007 100644
--- 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 9fb0bf6..5a61a4e 100644
--- 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 ddd404d..06d9fe8 100644
--- 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 a99b9be..9f53637 100644
--- 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 2433c61..54a46f0 100644
--- 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 0480282..f05626e 100644
--- 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 207140f..acbb4ef 100644
--- 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 a115548..eb574d9 100644
--- 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 2218a60..2985187 100644
--- 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 0c472b7..8f1e515 100644
--- 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 8b73f2b..a5b3966 100644
--- 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 12a7e97..82397e9 100644
--- 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 076ca51..b2161a2 100644
--- 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 5a0b783..29954fd 100644
--- 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 b30058b..d3e636e 100644
--- 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 5511189..3bfa604 100644
--- 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 26124f1..dde729f 100644
--- 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 14cbab1..853d8a4 100644
--- 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)