From 59e949294f4688bafe44b7def2972987224520c8 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 20 Jan 2014 10:26:57 +0100
Subject: rename library to libnftnl

We plan to use this library name for the higher layer library.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/Makefile.am      |  74 +++++++++----------
 src/chain.c          |   2 +-
 src/common.c         |   2 +-
 src/expr.c           |   2 +-
 src/expr/bitwise.c   |   4 +-
 src/expr/byteorder.c |   4 +-
 src/expr/cmp.c       |   4 +-
 src/expr/counter.c   |   4 +-
 src/expr/ct.c        |   4 +-
 src/expr/data_reg.c  |   4 +-
 src/expr/exthdr.c    |   4 +-
 src/expr/immediate.c |   4 +-
 src/expr/limit.c     |   4 +-
 src/expr/log.c       |   4 +-
 src/expr/lookup.c    |   4 +-
 src/expr/match.c     |   4 +-
 src/expr/meta.c      |   4 +-
 src/expr/nat.c       |   4 +-
 src/expr/payload.c   |   4 +-
 src/expr/reject.c    |   4 +-
 src/expr/target.c    |   4 +-
 src/internal.h       |   2 +-
 src/jansson.c        |   4 +-
 src/libnftables.map  | 198 ---------------------------------------------------
 src/libnftnl.map     | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mxml.c           |  10 +--
 src/rule.c           |   4 +-
 src/ruleset.c        |  10 +--
 src/set.c            |   2 +-
 src/set_elem.c       |   4 +-
 src/table.c          |   2 +-
 31 files changed, 291 insertions(+), 291 deletions(-)
 delete mode 100644 src/libnftables.map
 create mode 100644 src/libnftnl.map

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index fc13e46..450279f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,40 +1,40 @@
 include $(top_srcdir)/Make_global.am
-lib_LTLIBRARIES = libnftables.la
+lib_LTLIBRARIES = libnftnl.la
 
-libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
-libnftables_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftables.map \
-			 -version-info $(LIBVERSION)
+libnftnl_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
+libnftnl_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftnl.map	\
+		      -version-info $(LIBVERSION)
 
-libnftables_la_SOURCES = utils.c		\
-			 common.c		\
-			 table.c		\
-			 chain.c		\
-			 rule.c			\
-			 set.c			\
-			 set_elem.c		\
-			 ruleset.c		\
-			 mxml.c			\
-			 jansson.c		\
-			 expr.c			\
-			 expr_ops.c		\
-			 expr/bitwise.c		\
-			 expr/byteorder.c	\
-			 expr/cmp.c		\
-			 expr/counter.c		\
-			 expr/ct.c		\
-			 expr/data_reg.c	\
-			 expr/exthdr.c		\
-			 expr/limit.c		\
-			 expr/log.c		\
-			 expr/lookup.c		\
-			 expr/immediate.c	\
-			 expr/match.c		\
-			 expr/meta.c		\
-			 expr/nat.c		\
-			 expr/payload.c		\
-			 expr/reject.c		\
-			 expr/target.c		\
-			 expr/data_reg.h	\
-			 libnftables.map	\
-			 expr_ops.h		\
-			 internal.h
+libnftnl_la_SOURCES = utils.c		\
+		      common.c		\
+		      table.c		\
+		      chain.c		\
+		      rule.c		\
+		      set.c		\
+		      set_elem.c	\
+		      ruleset.c		\
+		      mxml.c		\
+		      jansson.c		\
+		      expr.c		\
+		      expr_ops.c	\
+		      expr/bitwise.c	\
+		      expr/byteorder.c	\
+		      expr/cmp.c	\
+		      expr/counter.c	\
+		      expr/ct.c		\
+		      expr/data_reg.c	\
+		      expr/exthdr.c	\
+		      expr/limit.c	\
+		      expr/log.c	\
+		      expr/lookup.c	\
+		      expr/immediate.c	\
+		      expr/match.c	\
+		      expr/meta.c	\
+		      expr/nat.c	\
+		      expr/payload.c	\
+		      expr/reject.c	\
+		      expr/target.c	\
+		      expr/data_reg.h	\
+		      libnftnl.map	\
+		      expr_ops.h	\
+		      internal.h
diff --git a/src/chain.c b/src/chain.c
index 37515bb..e26200d 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -26,7 +26,7 @@
 #include <linux/netfilter.h>
 #include <linux/netfilter_arp.h>
 
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
 
 struct nft_chain {
 	struct list_head head;
diff --git a/src/common.c b/src/common.c
index 5c6ddbf..b9598bf 100644
--- a/src/common.c
+++ b/src/common.c
@@ -11,7 +11,7 @@
 #include <linux/netfilter/nfnetlink.h>
 
 #include <libmnl/libmnl.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
 
 #include "internal.h"
 #include<stdlib.h>
diff --git a/src/expr.c b/src/expr.c
index aeb717e..55557da 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -22,7 +22,7 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/expr.h>
+#include <libnftnl/expr.h>
 
 #include "linux_list.h"
 
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index e57c244..c8fd0ec 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -18,8 +18,8 @@
 #include <errno.h>
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "data_reg.h"
 #include "expr_ops.h"
 
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 49ae38f..4889e80 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -18,8 +18,8 @@
 #include <errno.h>
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "data_reg.h"
 #include "expr_ops.h"
 
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index ebd3e5c..63250f3 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -19,8 +19,8 @@
 
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 #include "data_reg.h"
 
diff --git a/src/expr/counter.c b/src/expr/counter.c
index 11afb83..4bb7f1b 100644
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -19,8 +19,8 @@
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 struct nft_expr_counter {
diff --git a/src/expr/ct.c b/src/expr/ct.c
index 584f7a6..051a1c5 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -18,8 +18,8 @@
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 struct nft_expr_ct {
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index a755948..0523cb7 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -20,8 +20,8 @@
 #include <libmnl/libmnl.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 #include "data_reg.h"
 #include "internal.h"
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 0bf1de3..66a6cf5 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -21,8 +21,8 @@
 
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 
 #include "expr_ops.h"
 
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index db7b958..b3c52b8 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -17,8 +17,8 @@
 #include "internal.h"
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 #include "data_reg.h"
 
diff --git a/src/expr/limit.c b/src/expr/limit.c
index e6b0492..7d10340 100644
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -19,8 +19,8 @@
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 struct nft_expr_limit {
diff --git a/src/expr/log.c b/src/expr/log.c
index c62a8b4..5119c20 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -18,8 +18,8 @@
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 struct nft_expr_log {
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 0e53f58..5e0bf75 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -18,8 +18,8 @@
 #include <errno.h>
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
 #include "data_reg.h"
 #include "expr_ops.h"
 
diff --git a/src/expr/match.c b/src/expr/match.c
index 5487050..9f2fa03 100644
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -22,8 +22,8 @@
 #include <linux/netfilter/nf_tables_compat.h>
 #include <linux/netfilter/x_tables.h>
 
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 
 #include "expr_ops.h"
 
diff --git a/src/expr/meta.c b/src/expr/meta.c
index 6c3e20e..e2a198a 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -18,8 +18,8 @@
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 #ifndef NFT_META_MAX
diff --git a/src/expr/nat.c b/src/expr/nat.c
index 65b35ea..42f2b49 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -20,8 +20,8 @@
 #include <arpa/inet.h>
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 struct nft_expr_nat {
diff --git a/src/expr/payload.c b/src/expr/payload.c
index d64b097..ad82015 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -21,8 +21,8 @@
 
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 
 #include "expr_ops.h"
 
diff --git a/src/expr/reject.c b/src/expr/reject.c
index c06b070..62346e9 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -18,8 +18,8 @@
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 #include "expr_ops.h"
 
 struct nft_expr_reject {
diff --git a/src/expr/target.c b/src/expr/target.c
index 071fb07..36e37de 100644
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -22,8 +22,8 @@
 #include <linux/netfilter/nf_tables_compat.h>
 #include <linux/netfilter/x_tables.h>
 
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
 
 #include "expr_ops.h"
 
diff --git a/src/internal.h b/src/internal.h
index 256dd3d..a3fc46f 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
 
 #define BASE_DEC 10
 #define BASE_HEX 16
diff --git a/src/jansson.c b/src/jansson.c
index 26bd700..5107eb5 100644
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -16,9 +16,9 @@
 #include <errno.h>
 #include <string.h>
 #include "expr_ops.h"
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
 
-#include <libnftables/expr.h>
+#include <libnftnl/expr.h>
 #include <linux/netfilter/nf_tables.h>
 
 #ifdef JSON_PARSING
diff --git a/src/libnftables.map b/src/libnftables.map
deleted file mode 100644
index faf0913..0000000
--- a/src/libnftables.map
+++ /dev/null
@@ -1,198 +0,0 @@
-LIBNFTABLES_1.0 {
-global:
-  nft_table_alloc;
-  nft_table_free;
-  nft_table_attr_is_set;
-  nft_table_attr_unset;
-  nft_table_attr_set;
-  nft_table_attr_get;
-  nft_table_attr_set_u8;
-  nft_table_attr_set_u32;
-  nft_table_attr_set_str;
-  nft_table_attr_get_u8;
-  nft_table_attr_get_u32;
-  nft_table_attr_get_str;
-  nft_table_parse;
-  nft_table_parse_file;
-  nft_table_snprintf;
-  nft_table_fprintf;
-  nft_table_nlmsg_build_payload;
-  nft_table_nlmsg_parse;
-  nft_table_list_alloc;
-  nft_table_list_free;
-  nft_table_list_is_empty;
-  nft_table_list_foreach;
-  nft_table_list_add;
-  nft_table_list_add_tail;
-  nft_table_list_del;
-  nft_table_list_iter_create;
-  nft_table_list_iter_next;
-  nft_table_list_iter_destroy;
-
-  nft_chain_alloc;
-  nft_chain_free;
-  nft_chain_attr_is_set;
-  nft_chain_attr_unset;
-  nft_chain_attr_set;
-  nft_chain_attr_set_u8;
-  nft_chain_attr_set_u32;
-  nft_chain_attr_set_s32;
-  nft_chain_attr_set_u64;
-  nft_chain_attr_set_str;
-  nft_chain_attr_get;
-  nft_chain_attr_get_u8;
-  nft_chain_attr_get_u32;
-  nft_chain_attr_get_s32;
-  nft_chain_attr_get_u64;
-  nft_chain_attr_get_str;
-  nft_chain_parse;
-  nft_chain_parse_file;
-  nft_chain_snprintf;
-  nft_chain_fprintf;
-  nft_chain_nlmsg_build_payload;
-  nft_chain_nlmsg_parse;
-  nft_chain_list_alloc;
-  nft_chain_list_free;
-  nft_chain_list_is_empty;
-  nft_chain_list_add;
-  nft_chain_list_add_tail;
-  nft_chain_list_del;
-  nft_chain_list_foreach;
-  nft_chain_list_iter_create;
-  nft_chain_list_iter_next;
-  nft_chain_list_iter_destroy;
-
-  nft_rule_alloc;
-  nft_rule_free;
-  nft_rule_attr_is_set;
-  nft_rule_attr_unset;
-  nft_rule_attr_set;
-  nft_rule_attr_set_u32;
-  nft_rule_attr_set_u64;
-  nft_rule_attr_set_str;
-  nft_rule_attr_get;
-  nft_rule_attr_get_u8;
-  nft_rule_attr_get_u32;
-  nft_rule_attr_get_u64;
-  nft_rule_attr_get_str;
-  nft_rule_parse;
-  nft_rule_parse_file;
-  nft_rule_snprintf;
-  nft_rule_fprintf;
-  nft_rule_nlmsg_build_payload;
-  nft_rule_nlmsg_parse;
-  nft_rule_add_expr;
-
-  nft_rule_expr_foreach;
-  nft_rule_expr_iter_create;
-  nft_rule_expr_iter_next;
-  nft_rule_expr_iter_destroy;
-
-  nft_rule_expr_alloc;
-  nft_rule_expr_is_set;
-  nft_rule_expr_set;
-  nft_rule_expr_set_u8;
-  nft_rule_expr_set_u16;
-  nft_rule_expr_set_u32;
-  nft_rule_expr_set_u64;
-  nft_rule_expr_set_str;
-  nft_rule_expr_get;
-  nft_rule_expr_get_u8;
-  nft_rule_expr_get_u16;
-  nft_rule_expr_get_u32;
-  nft_rule_expr_get_u64;
-  nft_rule_expr_get_str;
-  nft_rule_expr_build_payload;
-  nft_rule_expr_snprintf;
-  nft_rule_expr_free;
-
-  nft_rule_list_alloc;
-  nft_rule_list_free;
-  nft_rule_list_is_empty;
-  nft_rule_list_add;
-  nft_rule_list_add_tail;
-  nft_rule_list_del;
-  nft_rule_list_foreach;
-  nft_rule_list_iter_create;
-  nft_rule_list_iter_cur;
-  nft_rule_list_iter_next;
-  nft_rule_list_iter_destroy;
-
-  nft_set_alloc;
-  nft_set_free;
-  nft_set_attr_unset;
-  nft_set_attr_is_set;
-  nft_set_attr_set;
-  nft_set_attr_set_u32;
-  nft_set_attr_set_str;
-  nft_set_attr_get;
-  nft_set_attr_get_str;
-  nft_set_attr_get_u32;
-  nft_set_nlmsg_build_payload;
-  nft_set_nlmsg_parse;
-  nft_set_parse;
-  nft_set_parse_file;
-  nft_set_snprintf;
-  nft_set_fprintf;
-
-  nft_set_list_alloc;
-  nft_set_list_free;
-  nft_set_list_add;
-  nft_set_list_add_tail;
-  nft_set_list_del;
-  nft_set_list_is_empty;
-  nft_set_list_foreach;
-
-  nft_set_list_iter_create;
-  nft_set_list_iter_cur;
-  nft_set_list_iter_next;
-  nft_set_list_iter_destroy;
-
-  nft_set_elem_alloc;
-  nft_set_elem_free;
-  nft_set_elem_add;
-  nft_set_elem_foreach;
-  nft_set_elem_attr_is_set;
-  nft_set_elem_attr_unset;
-  nft_set_elem_attr_set;
-  nft_set_elem_attr_set_u32;
-  nft_set_elem_attr_set_str;
-  nft_set_elem_attr_get;
-  nft_set_elem_attr_get_str;
-  nft_set_elem_attr_get_u32;
-  nft_set_elem_nlmsg_build_payload;
-  nft_set_elem_nlmsg_parse;
-  nft_set_elem_parse;
-  nft_set_elem_parse_file;
-  nft_set_elem_snprintf;
-  nft_set_elem_fprinf;
-
-  nft_set_elems_nlmsg_build_payload;
-  nft_set_elems_nlmsg_parse;
-
-  nft_set_elems_foreach;
-
-  nft_set_elems_iter_create;
-  nft_set_elems_iter_cur;
-  nft_set_elems_iter_next;
-  nft_set_elems_iter_destroy;
-
-  nft_ruleset_alloc;
-  nft_ruleset_free;
-  nft_ruleset_attr_is_set;
-  nft_ruleset_attr_unset;
-  nft_ruleset_attr_set;
-  nft_ruleset_attr_get;
-  nft_ruleset_parse;
-  nft_ruleset_parse_file;
-  nft_ruleset_snprintf;
-  nft_ruleset_fprintf;
-
-  nft_nlmsg_build_hdr;
-
-  nft_parse_err_alloc;
-  nft_parse_err_free;
-  nft_parse_perror;
-
-local: *;
-};
diff --git a/src/libnftnl.map b/src/libnftnl.map
new file mode 100644
index 0000000..43378ed
--- /dev/null
+++ b/src/libnftnl.map
@@ -0,0 +1,198 @@
+LIBNFTNL_1.0 {
+global:
+  nft_table_alloc;
+  nft_table_free;
+  nft_table_attr_is_set;
+  nft_table_attr_unset;
+  nft_table_attr_set;
+  nft_table_attr_get;
+  nft_table_attr_set_u8;
+  nft_table_attr_set_u32;
+  nft_table_attr_set_str;
+  nft_table_attr_get_u8;
+  nft_table_attr_get_u32;
+  nft_table_attr_get_str;
+  nft_table_parse;
+  nft_table_parse_file;
+  nft_table_snprintf;
+  nft_table_fprintf;
+  nft_table_nlmsg_build_payload;
+  nft_table_nlmsg_parse;
+  nft_table_list_alloc;
+  nft_table_list_free;
+  nft_table_list_is_empty;
+  nft_table_list_foreach;
+  nft_table_list_add;
+  nft_table_list_add_tail;
+  nft_table_list_del;
+  nft_table_list_iter_create;
+  nft_table_list_iter_next;
+  nft_table_list_iter_destroy;
+
+  nft_chain_alloc;
+  nft_chain_free;
+  nft_chain_attr_is_set;
+  nft_chain_attr_unset;
+  nft_chain_attr_set;
+  nft_chain_attr_set_u8;
+  nft_chain_attr_set_u32;
+  nft_chain_attr_set_s32;
+  nft_chain_attr_set_u64;
+  nft_chain_attr_set_str;
+  nft_chain_attr_get;
+  nft_chain_attr_get_u8;
+  nft_chain_attr_get_u32;
+  nft_chain_attr_get_s32;
+  nft_chain_attr_get_u64;
+  nft_chain_attr_get_str;
+  nft_chain_parse;
+  nft_chain_parse_file;
+  nft_chain_snprintf;
+  nft_chain_fprintf;
+  nft_chain_nlmsg_build_payload;
+  nft_chain_nlmsg_parse;
+  nft_chain_list_alloc;
+  nft_chain_list_free;
+  nft_chain_list_is_empty;
+  nft_chain_list_add;
+  nft_chain_list_add_tail;
+  nft_chain_list_del;
+  nft_chain_list_foreach;
+  nft_chain_list_iter_create;
+  nft_chain_list_iter_next;
+  nft_chain_list_iter_destroy;
+
+  nft_rule_alloc;
+  nft_rule_free;
+  nft_rule_attr_is_set;
+  nft_rule_attr_unset;
+  nft_rule_attr_set;
+  nft_rule_attr_set_u32;
+  nft_rule_attr_set_u64;
+  nft_rule_attr_set_str;
+  nft_rule_attr_get;
+  nft_rule_attr_get_u8;
+  nft_rule_attr_get_u32;
+  nft_rule_attr_get_u64;
+  nft_rule_attr_get_str;
+  nft_rule_parse;
+  nft_rule_parse_file;
+  nft_rule_snprintf;
+  nft_rule_fprintf;
+  nft_rule_nlmsg_build_payload;
+  nft_rule_nlmsg_parse;
+  nft_rule_add_expr;
+
+  nft_rule_expr_foreach;
+  nft_rule_expr_iter_create;
+  nft_rule_expr_iter_next;
+  nft_rule_expr_iter_destroy;
+
+  nft_rule_expr_alloc;
+  nft_rule_expr_is_set;
+  nft_rule_expr_set;
+  nft_rule_expr_set_u8;
+  nft_rule_expr_set_u16;
+  nft_rule_expr_set_u32;
+  nft_rule_expr_set_u64;
+  nft_rule_expr_set_str;
+  nft_rule_expr_get;
+  nft_rule_expr_get_u8;
+  nft_rule_expr_get_u16;
+  nft_rule_expr_get_u32;
+  nft_rule_expr_get_u64;
+  nft_rule_expr_get_str;
+  nft_rule_expr_build_payload;
+  nft_rule_expr_snprintf;
+  nft_rule_expr_free;
+
+  nft_rule_list_alloc;
+  nft_rule_list_free;
+  nft_rule_list_is_empty;
+  nft_rule_list_add;
+  nft_rule_list_add_tail;
+  nft_rule_list_del;
+  nft_rule_list_foreach;
+  nft_rule_list_iter_create;
+  nft_rule_list_iter_cur;
+  nft_rule_list_iter_next;
+  nft_rule_list_iter_destroy;
+
+  nft_set_alloc;
+  nft_set_free;
+  nft_set_attr_unset;
+  nft_set_attr_is_set;
+  nft_set_attr_set;
+  nft_set_attr_set_u32;
+  nft_set_attr_set_str;
+  nft_set_attr_get;
+  nft_set_attr_get_str;
+  nft_set_attr_get_u32;
+  nft_set_nlmsg_build_payload;
+  nft_set_nlmsg_parse;
+  nft_set_parse;
+  nft_set_parse_file;
+  nft_set_snprintf;
+  nft_set_fprintf;
+
+  nft_set_list_alloc;
+  nft_set_list_free;
+  nft_set_list_add;
+  nft_set_list_add_tail;
+  nft_set_list_del;
+  nft_set_list_is_empty;
+  nft_set_list_foreach;
+
+  nft_set_list_iter_create;
+  nft_set_list_iter_cur;
+  nft_set_list_iter_next;
+  nft_set_list_iter_destroy;
+
+  nft_set_elem_alloc;
+  nft_set_elem_free;
+  nft_set_elem_add;
+  nft_set_elem_foreach;
+  nft_set_elem_attr_is_set;
+  nft_set_elem_attr_unset;
+  nft_set_elem_attr_set;
+  nft_set_elem_attr_set_u32;
+  nft_set_elem_attr_set_str;
+  nft_set_elem_attr_get;
+  nft_set_elem_attr_get_str;
+  nft_set_elem_attr_get_u32;
+  nft_set_elem_nlmsg_build_payload;
+  nft_set_elem_nlmsg_parse;
+  nft_set_elem_parse;
+  nft_set_elem_parse_file;
+  nft_set_elem_snprintf;
+  nft_set_elem_fprinf;
+
+  nft_set_elems_nlmsg_build_payload;
+  nft_set_elems_nlmsg_parse;
+
+  nft_set_elems_foreach;
+
+  nft_set_elems_iter_create;
+  nft_set_elems_iter_cur;
+  nft_set_elems_iter_next;
+  nft_set_elems_iter_destroy;
+
+  nft_ruleset_alloc;
+  nft_ruleset_free;
+  nft_ruleset_attr_is_set;
+  nft_ruleset_attr_unset;
+  nft_ruleset_attr_set;
+  nft_ruleset_attr_get;
+  nft_ruleset_parse;
+  nft_ruleset_parse_file;
+  nft_ruleset_snprintf;
+  nft_ruleset_fprintf;
+
+  nft_nlmsg_build_hdr;
+
+  nft_parse_err_alloc;
+  nft_parse_err_free;
+  nft_parse_perror;
+
+local: *;
+};
diff --git a/src/mxml.c b/src/mxml.c
index 4988502..b2cb95e 100644
--- a/src/mxml.c
+++ b/src/mxml.c
@@ -15,11 +15,11 @@
 #include <limits.h>
 
 #include <linux/netfilter/nf_tables.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
-#include <libnftables/set.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/set.h>
 
 #ifdef XML_PARSING
 mxml_node_t *nft_mxml_build_tree(const void *data, const char *treename,
diff --git a/src/rule.c b/src/rule.c
index 9b4b01f..53d2ebf 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -24,8 +24,8 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
 
 #include "linux_list.h"
 #include "expr_ops.h"
diff --git a/src/ruleset.c b/src/ruleset.c
index f5e1157..3cbec09 100644
--- a/src/ruleset.c
+++ b/src/ruleset.c
@@ -17,11 +17,11 @@
 #include <stdlib.h>
 
 #include <libmnl/libmnl.h>
-#include <libnftables/ruleset.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/set.h>
-#include <libnftables/rule.h>
+#include <libnftnl/ruleset.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/set.h>
+#include <libnftnl/rule.h>
 
 struct nft_ruleset {
 	struct nft_table_list	*table_list;
diff --git a/src/set.c b/src/set.c
index bee9540..c3a7fae 100644
--- a/src/set.c
+++ b/src/set.c
@@ -23,7 +23,7 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
 
 #include "linux_list.h"
 #include "expr/data_reg.h"
diff --git a/src/set_elem.c b/src/set_elem.c
index 26c11d0..79fc641 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -22,8 +22,8 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/set.h>
-#include <libnftables/rule.h>
+#include <libnftnl/set.h>
+#include <libnftnl/rule.h>
 
 #include "linux_list.h"
 #include "expr/data_reg.h"
diff --git a/src/table.c b/src/table.c
index ad3570f..f50a968 100644
--- a/src/table.c
+++ b/src/table.c
@@ -23,7 +23,7 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nf_tables.h>
 
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
 
 struct nft_table {
 	struct list_head head;
-- 
cgit v1.2.3