diff mbox series

libnftnl src: Use double quotes in #includes for non-system headers

Message ID 20180605174612.9776-1-duncan_roe@optusnet.com.au
State Not Applicable
Delegated to: Pablo Neira
Headers show
Series libnftnl src: Use double quotes in #includes for non-system headers | expand

Commit Message

Duncan Roe June 5, 2018, 5:46 p.m. UTC
libnftnl carries a private copy of a number of system headers. These were mostly
still being included with angle brackets as though they were in a standard
location. Tested configurations of gcc would pick up the private copy in these
cases but it has been reported that others do not.

By using double quotes, developers are reminded that the code is using a
private copy of a system header which may differ from the installed one.

This patch is not applied to sources in ./examples/, because it is expected
that these may be compiled out-of-tree, where angle brackets are appropriate.

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 include/data_reg.h              |  2 +-
 include/libnftnl/chain.h        |  2 +-
 include/libnftnl/flowtable.h    |  2 +-
 include/libnftnl/gen.h          |  2 +-
 include/libnftnl/object.h       |  2 +-
 include/libnftnl/rule.h         |  2 +-
 include/libnftnl/ruleset.h      |  2 +-
 include/libnftnl/set.h          |  2 +-
 include/libnftnl/table.h        |  2 +-
 include/set.h                   |  2 +-
 include/set_elem.h              |  2 +-
 include/utils.h                 |  2 +-
 src/batch.c                     |  2 +-
 src/buffer.c                    |  6 +++---
 src/chain.c                     | 10 +++++-----
 src/common.c                    | 10 +++++-----
 src/expr.c                      |  6 +++---
 src/expr/bitwise.c              |  6 +++---
 src/expr/byteorder.c            |  6 +++---
 src/expr/cmp.c                  |  6 +++---
 src/expr/counter.c              |  6 +++---
 src/expr/ct.c                   |  6 +++---
 src/expr/data_reg.c             |  8 ++++----
 src/expr/dup.c                  |  8 ++++----
 src/expr/dynset.c               |  8 ++++----
 src/expr/exthdr.c               |  6 +++---
 src/expr/fib.c                  |  6 +++---
 src/expr/flow_offload.c         |  6 +++---
 src/expr/fwd.c                  |  8 ++++----
 src/expr/hash.c                 |  6 +++---
 src/expr/immediate.c            |  6 +++---
 src/expr/limit.c                |  6 +++---
 src/expr/log.c                  |  8 ++++----
 src/expr/lookup.c               |  6 +++---
 src/expr/masq.c                 |  6 +++---
 src/expr/match.c                |  8 ++++----
 src/expr/meta.c                 |  6 +++---
 src/expr/nat.c                  |  6 +++---
 src/expr/numgen.c               |  6 +++---
 src/expr/objref.c               |  6 +++---
 src/expr/payload.c              |  6 +++---
 src/expr/queue.c                |  6 +++---
 src/expr/quota.c                |  6 +++---
 src/expr/range.c                |  6 +++---
 src/expr/redir.c                |  6 +++---
 src/expr/reject.c               |  6 +++---
 src/expr/rt.c                   |  6 +++---
 src/expr/socket.c               |  6 +++---
 src/expr/target.c               |  8 ++++----
 src/expr_ops.c                  |  2 +-
 src/flowtable.c                 | 10 +++++-----
 src/gen.c                       |  6 +++---
 src/jansson.c                   |  8 ++++----
 src/obj/counter.c               |  4 ++--
 src/obj/ct_helper.c             |  4 ++--
 src/obj/limit.c                 |  4 ++--
 src/obj/quota.c                 |  4 ++--
 src/object.c                    |  8 ++++----
 src/rule.c                      | 12 ++++++------
 src/ruleset.c                   | 10 +++++-----
 src/set.c                       |  8 ++++----
 src/set_elem.c                  | 10 +++++-----
 src/table.c                     |  8 ++++----
 src/trace.c                     |  8 ++++----
 src/udata.c                     |  6 +++---
 src/utils.c                     |  8 ++++----
 tests/nft-chain-test.c          |  4 ++--
 tests/nft-expr_bitwise-test.c   |  6 +++---
 tests/nft-expr_byteorder-test.c |  6 +++---
 tests/nft-expr_cmp-test.c       |  6 +++---
 tests/nft-expr_counter-test.c   |  6 +++---
 tests/nft-expr_ct-test.c        |  6 +++---
 tests/nft-expr_dup-test.c       |  6 +++---
 tests/nft-expr_exthdr-test.c    |  6 +++---
 tests/nft-expr_fwd-test.c       |  6 +++---
 tests/nft-expr_hash-test.c      |  6 +++---
 tests/nft-expr_immediate-test.c |  6 +++---
 tests/nft-expr_limit-test.c     |  6 +++---
 tests/nft-expr_log-test.c       |  6 +++---
 tests/nft-expr_lookup-test.c    |  6 +++---
 tests/nft-expr_masq-test.c      |  6 +++---
 tests/nft-expr_match-test.c     |  6 +++---
 tests/nft-expr_meta-test.c      |  6 +++---
 tests/nft-expr_nat-test.c       |  6 +++---
 tests/nft-expr_numgen-test.c    |  6 +++---
 tests/nft-expr_objref-test.c    |  6 +++---
 tests/nft-expr_payload-test.c   |  6 +++---
 tests/nft-expr_queue-test.c     |  6 +++---
 tests/nft-expr_quota-test.c     |  6 +++---
 tests/nft-expr_range-test.c     |  6 +++---
 tests/nft-expr_redir-test.c     |  6 +++---
 tests/nft-expr_reject-test.c    |  6 +++---
 tests/nft-expr_target-test.c    |  6 +++---
 tests/nft-flowtable-test.c      |  4 ++--
 tests/nft-object-test.c         |  4 ++--
 tests/nft-parsing-test.c        | 10 +++++-----
 tests/nft-rule-test.c           |  6 +++---
 tests/nft-set-test.c            |  4 ++--
 tests/nft-table-test.c          |  4 ++--
 99 files changed, 288 insertions(+), 288 deletions(-)
diff mbox series

Patch

diff --git a/include/data_reg.h b/include/data_reg.h
index 3fec7cd..1f642d7 100644
--- a/include/data_reg.h
+++ b/include/data_reg.h
@@ -1,7 +1,7 @@ 
 #ifndef _DATA_H_
 #define _DATA_H_
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include <unistd.h>
diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h
index 237683e..73e65c7 100644
--- a/include/libnftnl/chain.h
+++ b/include/libnftnl/chain.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libnftnl/flowtable.h b/include/libnftnl/flowtable.h
index 6f68018..53b8127 100644
--- a/include/libnftnl/flowtable.h
+++ b/include/libnftnl/flowtable.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libnftnl/gen.h b/include/libnftnl/gen.h
index b55bded..1a039ec 100644
--- a/include/libnftnl/gen.h
+++ b/include/libnftnl/gen.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libnftnl/object.h b/include/libnftnl/object.h
index 93a40d0..fc2fe8d 100644
--- a/include/libnftnl/object.h
+++ b/include/libnftnl/object.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h
index 765d2ce..7caadc6 100644
--- a/include/libnftnl/rule.h
+++ b/include/libnftnl/rule.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libnftnl/ruleset.h b/include/libnftnl/ruleset.h
index fb40736..0c81eff 100644
--- a/include/libnftnl/ruleset.h
+++ b/include/libnftnl/ruleset.h
@@ -7,7 +7,7 @@ 
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h
index 27f5bc4..7be6992 100644
--- a/include/libnftnl/set.h
+++ b/include/libnftnl/set.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 enum nftnl_set_attr {
 	NFTNL_SET_TABLE,
diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h
index 44017c6..3821f64 100644
--- a/include/libnftnl/table.h
+++ b/include/libnftnl/table.h
@@ -6,7 +6,7 @@ 
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/set.h b/include/set.h
index 3bcec7c..fb97a5d 100644
--- a/include/set.h
+++ b/include/set.h
@@ -1,7 +1,7 @@ 
 #ifndef _LIBNFTNL_SET_INTERNAL_H_
 #define _LIBNFTNL_SET_INTERNAL_H_
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 struct nftnl_set {
 	struct list_head	head;
diff --git a/include/set_elem.h b/include/set_elem.h
index d6244e6..43d2c2d 100644
--- a/include/set_elem.h
+++ b/include/set_elem.h
@@ -1,7 +1,7 @@ 
 #ifndef _LIBNFTNL_SET_ELEM_INTERNAL_H_
 #define _LIBNFTNL_SET_ELEM_INTERNAL_H_
 
-#include <data_reg.h>
+#include "data_reg.h"
 
 struct nftnl_set_elem {
 	struct list_head	head;
diff --git a/include/utils.h b/include/utils.h
index 3cc6596..58810c0 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -5,7 +5,7 @@ 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
 #include "config.h"
 #ifdef HAVE_VISIBILITY_HIDDEN
diff --git a/src/batch.c b/src/batch.c
index ca8f922..8f9fe51 100644
--- a/src/batch.c
+++ b/src/batch.c
@@ -9,7 +9,7 @@ 
 #include "internal.h"
 #include <errno.h>
 #include <libmnl/libmnl.h>
-#include <libnftnl/batch.h>
+#include "libnftnl/batch.h"
 
 struct nftnl_batch {
 	uint32_t		num_pages;
diff --git a/src/buffer.c b/src/buffer.c
index 9ec86af..ecc3709 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -12,9 +12,9 @@ 
 #include <stdarg.h>
 #include <inttypes.h>
 #include <string.h>
-#include <buffer.h>
-#include <libnftnl/common.h>
-#include <libnftnl/expr.h>
+#include "buffer.h"
+#include "libnftnl/common.h"
+#include "libnftnl/expr.h"
 #include "internal.h"
 
 int nftnl_buf_update(struct nftnl_buf *b, int ret)
diff --git a/src/chain.c b/src/chain.c
index eff5186..eeedb66 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -21,13 +21,13 @@ 
 #include <inttypes.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
-#include <linux/netfilter.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
+#include "linux/netfilter.h"
 #include <linux/netfilter_arp.h>
 
-#include <libnftnl/chain.h>
-#include <buffer.h>
+#include "libnftnl/chain.h"
+#include "buffer.h"
 
 struct nftnl_chain {
 	struct list_head head;
diff --git a/src/common.c b/src/common.c
index 561c954..e22c5c8 100644
--- a/src/common.c
+++ b/src/common.c
@@ -11,13 +11,13 @@ 
 #include <sys/socket.h>
 #include <time.h>
 #include <linux/netlink.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
 #include <libmnl/libmnl.h>
-#include <libnftnl/common.h>
-#include <libnftnl/set.h>
-#include <buffer.h>
+#include "libnftnl/common.h"
+#include "libnftnl/set.h"
+#include "buffer.h"
 
 #include <errno.h>
 #include "internal.h"
diff --git a/src/expr.c b/src/expr.c
index 62565e0..8162057 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -19,10 +19,10 @@ 
 #include <netinet/in.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/expr.h>
+#include "libnftnl/expr.h"
 
 EXPORT_SYMBOL(nftnl_expr_alloc);
 struct nftnl_expr *nftnl_expr_alloc(const char *name)
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index a89734b..52c50d7 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -17,9 +17,9 @@ 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_bitwise {
 	enum nft_registers	sreg;
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 47c04cf..66bc6c4 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -17,9 +17,9 @@ 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_byteorder {
 	enum nft_registers	sreg;
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index b26d0eb..a96d06e 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -18,9 +18,9 @@ 
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_cmp {
 	union nftnl_data_reg	data;
diff --git a/src/expr/counter.c b/src/expr/counter.c
index 21901e8..76cf22a 100644
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -15,12 +15,12 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_counter {
 	uint64_t	pkts;
diff --git a/src/expr/ct.c b/src/expr/ct.c
index 39e9be6..0fa7c53 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -14,12 +14,12 @@ 
 #include <stdint.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_ct {
 	enum nft_ct_keys        key;
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index 1b28b29..fe90ab4 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -18,10 +18,10 @@ 
 #include <netinet/in.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter.h"
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 #include "internal.h"
 
 #ifdef JSON_PARSING
diff --git a/src/expr/dup.c b/src/expr/dup.c
index ed8e620..167cdfd 100644
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -14,12 +14,12 @@ 
 #include <errno.h>
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 #include "expr_ops.h"
 #include "data_reg.h"
-#include <buffer.h>
+#include "buffer.h"
 
 struct nftnl_expr_dup {
 	enum nft_registers	sreg_addr;
diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index 160d0e1..9b44812 100644
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -15,12 +15,12 @@ 
 #include <errno.h>
 #include <arpa/inet.h>
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 #include "data_reg.h"
 #include "expr_ops.h"
-#include <buffer.h>
+#include "buffer.h"
 
 struct nftnl_expr_dynset {
 	enum nft_registers	sreg_key;
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 75cafbc..8937cc5 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -19,10 +19,10 @@ 
 #include <errno.h>
 #include <libmnl/libmnl.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 #ifndef IPPROTO_MH
 #define IPPROTO_MH 135
diff --git a/src/expr/fib.c b/src/expr/fib.c
index b922b26..b2c4129 100644
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
@@ -14,12 +14,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_fib {
 	uint32_t		flags;
diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
index a2001c9..78dbce3 100644
--- a/src/expr/flow_offload.c
+++ b/src/expr/flow_offload.c
@@ -6,9 +6,9 @@ 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 struct nftnl_expr_flow {
 	char			*table_name;
diff --git a/src/expr/fwd.c b/src/expr/fwd.c
index 1312ea1..21d4da8 100644
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
@@ -14,12 +14,12 @@ 
 #include <errno.h>
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 #include "expr_ops.h"
 #include "data_reg.h"
-#include <buffer.h>
+#include "buffer.h"
 
 struct nftnl_expr_fwd {
 	enum nft_registers	sreg_dev;
diff --git a/src/expr/hash.c b/src/expr/hash.c
index 415537e..7259c55 100644
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
@@ -13,12 +13,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_hash {
 	enum nft_hash_types	type;
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index b0570bd..e8902d6 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -16,9 +16,9 @@ 
 #include <errno.h>
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_immediate {
 	union nftnl_data_reg	data;
diff --git a/src/expr/limit.c b/src/expr/limit.c
index 856ab18..4db186d 100644
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -15,12 +15,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_limit {
 	uint64_t		rate;
diff --git a/src/expr/log.c b/src/expr/log.c
index 86d9651..f9fab0c 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -14,13 +14,13 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
-#include <linux/netfilter/nf_log.h>
+#include "linux/netfilter/nf_tables.h"
+#include "linux/netfilter/nf_log.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_log {
 	uint32_t		snaplen;
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 5fcb81f..75cffd9 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -17,9 +17,9 @@ 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 struct nftnl_expr_lookup {
 	enum nft_registers	sreg;
diff --git a/src/expr/masq.c b/src/expr/masq.c
index 7c235d3..e15f4b8 100644
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
@@ -13,12 +13,12 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_masq {
 	uint32_t		flags;
diff --git a/src/expr/match.c b/src/expr/match.c
index dd09e1e..89052a7 100644
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -18,11 +18,11 @@ 
 #include <errno.h>
 #include <libmnl/libmnl.h>
 
-#include <linux/netfilter/nf_tables.h>
-#include <linux/netfilter/nf_tables_compat.h>
+#include "linux/netfilter/nf_tables.h"
+#include "linux/netfilter/nf_tables_compat.h"
 
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 /* From include/linux/netfilter/x_tables.h */
 #define XT_EXTENSION_MAXNAMELEN 29
diff --git a/src/expr/meta.c b/src/expr/meta.c
index de82105..a9df23f 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -14,12 +14,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 #ifndef NFT_META_MAX
 #define NFT_META_MAX (NFT_META_SECPATH + 1)
diff --git a/src/expr/nat.c b/src/expr/nat.c
index 9271303..9c28335 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -20,9 +20,9 @@ 
 #include <errno.h>
 #include <arpa/inet.h>
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_nat {
 	enum nft_registers sreg_addr_min;
diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index 5336fde..45668be 100644
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -13,12 +13,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_ng {
 	enum nft_registers	dreg;
diff --git a/src/expr/objref.c b/src/expr/objref.c
index 64ee863..4954643 100644
--- a/src/expr/objref.c
+++ b/src/expr/objref.c
@@ -13,12 +13,12 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_objref {
 	struct {
diff --git a/src/expr/payload.c b/src/expr/payload.c
index 91e1587..2dbe4b6 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -19,10 +19,10 @@ 
 #include <errno.h>
 #include <libmnl/libmnl.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_payload {
 	enum nft_registers	sreg;
diff --git a/src/expr/queue.c b/src/expr/queue.c
index a392a27..7ba7d0f 100644
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
@@ -13,12 +13,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_queue {
 	enum nft_registers	sreg_qnum;
diff --git a/src/expr/quota.c b/src/expr/quota.c
index 667e6e1..87b41e7 100644
--- a/src/expr/quota.c
+++ b/src/expr/quota.c
@@ -13,12 +13,12 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_quota {
 	uint64_t	bytes;
diff --git a/src/expr/range.c b/src/expr/range.c
index b2789ff..e9d0009 100644
--- a/src/expr/range.c
+++ b/src/expr/range.c
@@ -16,9 +16,9 @@ 
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_range {
 	union nftnl_data_reg	data_from;
diff --git a/src/expr/redir.c b/src/expr/redir.c
index b2aa345..c4edd01 100644
--- a/src/expr/redir.c
+++ b/src/expr/redir.c
@@ -13,12 +13,12 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_redir {
 	enum nft_registers sreg_proto_min;
diff --git a/src/expr/reject.c b/src/expr/reject.c
index 11d8b20..ad17e47 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -14,12 +14,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_reject {
 	uint32_t		type;
diff --git a/src/expr/rt.c b/src/expr/rt.c
index ab56831..f3edcdf 100644
--- a/src/expr/rt.c
+++ b/src/expr/rt.c
@@ -12,12 +12,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_rt {
 	enum nft_rt_keys	key;
diff --git a/src/expr/socket.c b/src/expr/socket.c
index db160a1..ab627b1 100644
--- a/src/expr/socket.c
+++ b/src/expr/socket.c
@@ -12,12 +12,12 @@ 
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_expr_socket {
 	enum nft_socket_keys	key;
diff --git a/src/expr/target.c b/src/expr/target.c
index ed4bf7d..68f2ffa 100644
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -18,11 +18,11 @@ 
 #include <errno.h>
 #include <libmnl/libmnl.h>
 
-#include <linux/netfilter/nf_tables.h>
-#include <linux/netfilter/nf_tables_compat.h>
+#include "linux/netfilter/nf_tables.h"
+#include "linux/netfilter/nf_tables_compat.h"
 
-#include <libnftnl/expr.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/expr.h"
+#include "libnftnl/rule.h"
 
 /* From include/linux/netfilter/x_tables.h */
 #define XT_EXTENSION_MAXNAMELEN 29
diff --git a/src/expr_ops.c b/src/expr_ops.c
index 9df55fd..378cb1f 100644
--- a/src/expr_ops.c
+++ b/src/expr_ops.c
@@ -1,5 +1,5 @@ 
 #include <string.h>
-#include <linux_list.h>
+#include "linux_list.h"
 
 #include "expr_ops.h"
 
diff --git a/src/flowtable.c b/src/flowtable.c
index c1ddae4..132520a 100644
--- a/src/flowtable.c
+++ b/src/flowtable.c
@@ -11,13 +11,13 @@ 
 #include <inttypes.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
-#include <linux/netfilter.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
+#include "linux/netfilter.h"
 #include <linux/netfilter_arp.h>
 
-#include <libnftnl/flowtable.h>
-#include <buffer.h>
+#include "libnftnl/flowtable.h"
+#include "buffer.h"
 
 struct nftnl_flowtable {
 	struct list_head	head;
diff --git a/src/gen.c b/src/gen.c
index f92180c..c327fe9 100644
--- a/src/gen.c
+++ b/src/gen.c
@@ -18,10 +18,10 @@ 
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/gen.h>
+#include "libnftnl/gen.h"
 
 struct nftnl_gen {
 	uint32_t id;
diff --git a/src/jansson.c b/src/jansson.c
index 3476ed2..9c0f607 100644
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -7,7 +7,7 @@ 
  * (at your option) any later version.
  */
 
-#include <internal.h>
+#include "internal.h"
 #include <stdlib.h>
 #include <limits.h>
 #include <stdint.h>
@@ -16,10 +16,10 @@ 
 #include <errno.h>
 #include <string.h>
 #include "expr_ops.h"
-#include <libnftnl/set.h>
+#include "libnftnl/set.h"
 
-#include <libnftnl/expr.h>
-#include <linux/netfilter/nf_tables.h>
+#include "libnftnl/expr.h"
+#include "linux/netfilter/nf_tables.h"
 
 #ifdef JSON_PARSING
 
diff --git a/src/obj/counter.c b/src/obj/counter.c
index 332bb2b..0c956f8 100644
--- a/src/obj/counter.c
+++ b/src/obj/counter.c
@@ -13,10 +13,10 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include <libmnl/libmnl.h>
-#include <libnftnl/object.h>
+#include "libnftnl/object.h"
 
 #include "internal.h"
 #include "obj.h"
diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
index 62569fe..21bb87d 100644
--- a/src/obj/ct_helper.c
+++ b/src/obj/ct_helper.c
@@ -14,11 +14,11 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/object.h>
+#include "libnftnl/object.h"
 
 #include "obj.h"
 
diff --git a/src/obj/limit.c b/src/obj/limit.c
index 7f8bcf7..7526ac7 100644
--- a/src/obj/limit.c
+++ b/src/obj/limit.c
@@ -13,11 +13,11 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/object.h>
+#include "libnftnl/object.h"
 
 #include "obj.h"
 
diff --git a/src/obj/quota.c b/src/obj/quota.c
index 6d36784..7a9e8f7 100644
--- a/src/obj/quota.c
+++ b/src/obj/quota.c
@@ -13,11 +13,11 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include "internal.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/object.h>
+#include "libnftnl/object.h"
 
 #include "obj.h"
 
diff --git a/src/object.c b/src/object.c
index d8278f3..5549978 100644
--- a/src/object.c
+++ b/src/object.c
@@ -18,11 +18,11 @@ 
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/object.h>
-#include <buffer.h>
+#include "libnftnl/object.h"
+#include "buffer.h"
 #include "obj.h"
 
 static struct obj_ops *obj_ops[] = {
diff --git a/src/rule.c b/src/rule.c
index 146b06c..260b07d 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -20,15 +20,15 @@ 
 #include <errno.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <buffer.h>
+#include "buffer.h"
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/rule.h>
-#include <libnftnl/set.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/set.h"
+#include "libnftnl/expr.h"
 
 struct nftnl_rule {
 	struct list_head head;
diff --git a/src/ruleset.c b/src/ruleset.c
index eb49fde..cd803c3 100644
--- a/src/ruleset.c
+++ b/src/ruleset.c
@@ -17,11 +17,11 @@ 
 #include <stdlib.h>
 
 #include <libmnl/libmnl.h>
-#include <libnftnl/ruleset.h>
-#include <libnftnl/table.h>
-#include <libnftnl/chain.h>
-#include <libnftnl/set.h>
-#include <libnftnl/rule.h>
+#include "libnftnl/ruleset.h"
+#include "libnftnl/table.h"
+#include "libnftnl/chain.h"
+#include "libnftnl/set.h"
+#include "libnftnl/rule.h"
 
 struct nftnl_ruleset {
 	struct nftnl_table_list	*table_list;
diff --git a/src/set.c b/src/set.c
index d2a7589..f6e4305 100644
--- a/src/set.c
+++ b/src/set.c
@@ -21,11 +21,11 @@ 
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/set.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/set.h"
+#include "libnftnl/expr.h"
 
 EXPORT_SYMBOL(nftnl_set_alloc);
 struct nftnl_set *nftnl_set_alloc(void)
diff --git a/src/set_elem.c b/src/set_elem.c
index 1ac53da..b537233 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -20,12 +20,12 @@ 
 #include <ctype.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/set.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/set.h"
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 EXPORT_SYMBOL(nftnl_set_elem_alloc);
 struct nftnl_set_elem *nftnl_set_elem_alloc(void)
diff --git a/src/table.c b/src/table.c
index e7616f6..d553b2a 100644
--- a/src/table.c
+++ b/src/table.c
@@ -20,11 +20,11 @@ 
 #include <errno.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/table.h>
-#include <buffer.h>
+#include "libnftnl/table.h"
+#include "buffer.h"
 
 struct nftnl_table {
 	struct list_head head;
diff --git a/src/trace.c b/src/trace.c
index f426437..127b22b 100644
--- a/src/trace.c
+++ b/src/trace.c
@@ -18,11 +18,11 @@ 
 #include <netinet/in.h>
 
 #include <libmnl/libmnl.h>
-#include <linux/netfilter.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter.h"
+#include "linux/netfilter/nfnetlink.h"
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/trace.h>
+#include "libnftnl/trace.h"
 
 struct nftnl_header_data {
 	char *data;
diff --git a/src/udata.c b/src/udata.c
index b5a4729..8bc4c24 100644
--- a/src/udata.c
+++ b/src/udata.c
@@ -8,9 +8,9 @@ 
  * (at your option) any later version.
  */
 
-#include <libnftnl/udata.h>
-#include <udata.h>
-#include <utils.h>
+#include "libnftnl/udata.h"
+#include "udata.h"
+#include "utils.h"
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/utils.c b/src/utils.c
index 3e44960..ef180ee 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -8,7 +8,7 @@ 
  * (at your option) any later version.
  */
 
-#include <internal.h>
+#include "internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
@@ -17,10 +17,10 @@ 
 #include <errno.h>
 #include <inttypes.h>
 
-#include <libnftnl/common.h>
+#include "libnftnl/common.h"
 
-#include <linux/netfilter.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter.h"
+#include "linux/netfilter/nf_tables.h"
 
 static const char *const nftnl_family_str[NFPROTO_NUMPROTO] = {
 	[NFPROTO_INET]		= "inet",
diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c
index d678d46..5e7a220 100644
--- a/tests/nft-chain-test.c
+++ b/tests/nft-chain-test.c
@@ -12,8 +12,8 @@ 
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/chain.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/chain.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c
index 64c1446..a9f25ed 100644
--- a/tests/nft-expr_bitwise-test.c
+++ b/tests/nft-expr_bitwise-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_byteorder-test.c b/tests/nft-expr_byteorder-test.c
index 5994e5b..f0379d3 100644
--- a/tests/nft-expr_byteorder-test.c
+++ b/tests/nft-expr_byteorder-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c
index ec00bb9..c190770 100644
--- a/tests/nft-expr_cmp-test.c
+++ b/tests/nft-expr_cmp-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_counter-test.c b/tests/nft-expr_counter-test.c
index 519bc1f..0961c17 100644
--- a/tests/nft-expr_counter-test.c
+++ b/tests/nft-expr_counter-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_ct-test.c b/tests/nft-expr_ct-test.c
index e98fbab..908425d 100644
--- a/tests/nft-expr_ct-test.c
+++ b/tests/nft-expr_ct-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 static void print_err(const char *msg)
diff --git a/tests/nft-expr_dup-test.c b/tests/nft-expr_dup-test.c
index 3c37d4a..b8a363e 100644
--- a/tests/nft-expr_dup-test.c
+++ b/tests/nft-expr_dup-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 static void print_err(const char *msg)
diff --git a/tests/nft-expr_exthdr-test.c b/tests/nft-expr_exthdr-test.c
index fef2dd0..d47d855 100644
--- a/tests/nft-expr_exthdr-test.c
+++ b/tests/nft-expr_exthdr-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_fwd-test.c b/tests/nft-expr_fwd-test.c
index 4fdf53d..953a778 100644
--- a/tests/nft-expr_fwd-test.c
+++ b/tests/nft-expr_fwd-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 static void print_err(const char *msg)
diff --git a/tests/nft-expr_hash-test.c b/tests/nft-expr_hash-test.c
index 7be6e9e..f6cf73c 100644
--- a/tests/nft-expr_hash-test.c
+++ b/tests/nft-expr_hash-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_immediate-test.c b/tests/nft-expr_immediate-test.c
index c25eedb..47efe5a 100644
--- a/tests/nft-expr_immediate-test.c
+++ b/tests/nft-expr_immediate-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_limit-test.c b/tests/nft-expr_limit-test.c
index 2838941..8b67b9b 100644
--- a/tests/nft-expr_limit-test.c
+++ b/tests/nft-expr_limit-test.c
@@ -14,11 +14,11 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c
index b7aa302..18d19dc 100644
--- a/tests/nft-expr_log-test.c
+++ b/tests/nft-expr_log-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c
index 9e6e051..5a895b5 100644
--- a/tests/nft-expr_lookup-test.c
+++ b/tests/nft-expr_lookup-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_masq-test.c b/tests/nft-expr_masq-test.c
index 3f9903d..1fa7843 100644
--- a/tests/nft-expr_masq-test.c
+++ b/tests/nft-expr_masq-test.c
@@ -12,10 +12,10 @@ 
 #include <stdlib.h>
 #include <string.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c
index 39a49d8..23a77d2 100644
--- a/tests/nft-expr_match-test.c
+++ b/tests/nft-expr_match-test.c
@@ -15,10 +15,10 @@ 
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_meta-test.c b/tests/nft-expr_meta-test.c
index 8fb7873..b656d09 100644
--- a/tests/nft-expr_meta-test.c
+++ b/tests/nft-expr_meta-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_nat-test.c b/tests/nft-expr_nat-test.c
index fd3a488..f4f9b6a 100644
--- a/tests/nft-expr_nat-test.c
+++ b/tests/nft-expr_nat-test.c
@@ -14,11 +14,11 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <linux/netfilter/xt_iprange.h>
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_numgen-test.c b/tests/nft-expr_numgen-test.c
index 0d0a3bb..185ea0c 100644
--- a/tests/nft-expr_numgen-test.c
+++ b/tests/nft-expr_numgen-test.c
@@ -14,10 +14,10 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_objref-test.c b/tests/nft-expr_objref-test.c
index 08e27ce..e615901 100644
--- a/tests/nft-expr_objref-test.c
+++ b/tests/nft-expr_objref-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_payload-test.c b/tests/nft-expr_payload-test.c
index 371372c..a344284 100644
--- a/tests/nft-expr_payload-test.c
+++ b/tests/nft-expr_payload-test.c
@@ -14,11 +14,11 @@ 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <linux/netfilter/xt_iprange.h>
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_queue-test.c b/tests/nft-expr_queue-test.c
index 81d7dd2..6ae62ea 100644
--- a/tests/nft-expr_queue-test.c
+++ b/tests/nft-expr_queue-test.c
@@ -16,11 +16,11 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <linux/netfilter/xt_iprange.h>
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_quota-test.c b/tests/nft-expr_quota-test.c
index 2320551..5f34d33 100644
--- a/tests/nft-expr_quota-test.c
+++ b/tests/nft-expr_quota-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_range-test.c b/tests/nft-expr_range-test.c
index b92dfc0..97bf140 100644
--- a/tests/nft-expr_range-test.c
+++ b/tests/nft-expr_range-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_redir-test.c b/tests/nft-expr_redir-test.c
index 6c8caec..1d3eeff 100644
--- a/tests/nft-expr_redir-test.c
+++ b/tests/nft-expr_redir-test.c
@@ -12,10 +12,10 @@ 
 #include <stdlib.h>
 #include <string.h>
 
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_reject-test.c b/tests/nft-expr_reject-test.c
index d8189ea..ac2aa2c 100644
--- a/tests/nft-expr_reject-test.c
+++ b/tests/nft-expr_reject-test.c
@@ -14,11 +14,11 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <linux/netfilter/xt_iprange.h>
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
index ba56b27..94967fd 100644
--- a/tests/nft-expr_target-test.c
+++ b/tests/nft-expr_target-test.c
@@ -14,10 +14,10 @@ 
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 #include <libmnl/libmnl.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/expr.h>
+#include "libnftnl/rule.h"
+#include "libnftnl/expr.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
index 1311cf2..d03523b 100644
--- a/tests/nft-flowtable-test.c
+++ b/tests/nft-flowtable-test.c
@@ -2,8 +2,8 @@ 
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/flowtable.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/flowtable.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-object-test.c b/tests/nft-object-test.c
index d2ca444..f95b60c 100644
--- a/tests/nft-object-test.c
+++ b/tests/nft-object-test.c
@@ -13,8 +13,8 @@ 
 #include <string.h>
 #include <netinet/in.h>
 
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/object.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/object.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-parsing-test.c b/tests/nft-parsing-test.c
index d25a73e..903a083 100644
--- a/tests/nft-parsing-test.c
+++ b/tests/nft-parsing-test.c
@@ -7,11 +7,11 @@ 
 #include <getopt.h>
 
 #include <libmnl/libmnl.h> /*nlmsghdr*/
-#include <libnftnl/ruleset.h>
-#include <libnftnl/table.h>
-#include <libnftnl/chain.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/set.h>
+#include "libnftnl/ruleset.h"
+#include "libnftnl/table.h"
+#include "libnftnl/chain.h"
+#include "libnftnl/rule.h"
+#include "libnftnl/set.h"
 
 enum {
 	TEST_XML_RULESET,
diff --git a/tests/nft-rule-test.c b/tests/nft-rule-test.c
index dee3530..8ac64ed 100644
--- a/tests/nft-rule-test.c
+++ b/tests/nft-rule-test.c
@@ -13,9 +13,9 @@ 
 #include <string.h>
 
 #include <netinet/in.h>
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/rule.h>
-#include <libnftnl/udata.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/rule.h"
+#include "libnftnl/udata.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-set-test.c b/tests/nft-set-test.c
index 173c17f..d023b36 100644
--- a/tests/nft-set-test.c
+++ b/tests/nft-set-test.c
@@ -12,9 +12,9 @@ 
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h>
-#include <linux/netfilter/nf_tables.h>
+#include "linux/netfilter/nf_tables.h"
 
-#include <libnftnl/set.h>
+#include "libnftnl/set.h"
 
 static int test_ok = 1;
 
diff --git a/tests/nft-table-test.c b/tests/nft-table-test.c
index 1031ffe..a3cf52f 100644
--- a/tests/nft-table-test.c
+++ b/tests/nft-table-test.c
@@ -13,8 +13,8 @@ 
 #include <string.h>
 #include <netinet/in.h>
 
-#include <linux/netfilter/nf_tables.h>
-#include <libnftnl/table.h>
+#include "linux/netfilter/nf_tables.h"
+#include "libnftnl/table.h"
 
 static int test_ok = 1;