From 06c53cf545c0e67f088761ca4c290bcb327643e6 Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jan.vcelak@nic.cz>
Date: Fri, 11 Oct 2013 14:05:53 +0200
Subject: [PATCH] make all include paths relative to /src

---
 src/Makefile.am                            |  6 ++--
 src/common/base32hex.c                     |  4 +--
 src/common/base64.c                        |  4 +--
 src/common/dSFMT-params.h                  |  4 +--
 src/common/dSFMT.c                         |  2 +-
 src/common/fdset.c                         |  2 +-
 src/common/hattrie/ahtable.c               |  4 +--
 src/common/hattrie/ahtable.h               |  4 +--
 src/common/hattrie/hat-trie.c              |  4 +--
 src/common/hattrie/hat-trie.h              |  2 +-
 src/common/hattrie/murmurhash3.c           |  2 +-
 src/common/heap.c                          |  2 +-
 src/common/libtap/tap.c                    |  4 +--
 src/common/mempattern.c                    |  2 +-
 src/common/mempool.c                       |  2 +-
 src/common/print.c                         |  2 +-
 src/common/prng.c                          |  6 ++--
 src/common/ref.c                           |  2 +-
 src/knot/conf/cf-parse.y                   |  2 +-
 src/knot/ctl/remote.c                      |  2 +-
 src/knot/main.c                            |  2 +-
 src/knot/server/journal.c                  |  4 +--
 src/knot/zone/estimator.c                  |  4 +--
 src/knot/zone/semantic-check.c             |  2 +-
 src/libknot/dname.c                        | 14 ++++-----
 src/libknot/dnssec/key.c                   | 12 ++++----
 src/libknot/dnssec/key.h                   |  6 ++--
 src/libknot/dnssec/nsec3.c                 |  4 +--
 src/libknot/dnssec/nsec3.h                 |  2 +-
 src/libknot/dnssec/sig0.c                  |  6 ++--
 src/libknot/dnssec/sign.c                  | 12 ++++----
 src/libknot/dnssec/zone-events.c           |  6 ++--
 src/libknot/dnssec/zone-sign.c             |  6 ++--
 src/libknot/edns.c                         |  6 ++--
 src/libknot/edns.h                         |  4 +--
 src/libknot/libknot.h                      | 34 +++++++++++-----------
 src/libknot/nameserver/chaos.c             |  6 ++--
 src/libknot/nameserver/chaos.h             |  4 +--
 src/libknot/nameserver/name-server.c       | 24 +++++++--------
 src/libknot/nameserver/name-server.h       | 12 ++++----
 src/libknot/packet/packet.c                | 10 +++----
 src/libknot/packet/packet.h                | 10 +++----
 src/libknot/packet/query.c                 |  4 +--
 src/libknot/packet/query.h                 |  8 ++---
 src/libknot/packet/response.c              | 14 ++++-----
 src/libknot/packet/response.h              |  8 ++---
 src/libknot/rdata.h                        |  6 ++--
 src/libknot/rrset.c                        | 14 ++++-----
 src/libknot/rrset.h                        |  2 +-
 src/libknot/tsig-op.c                      | 12 ++++----
 src/libknot/tsig-op.h                      |  4 +--
 src/libknot/tsig.c                         | 14 ++++-----
 src/libknot/tsig.h                         |  6 ++--
 src/libknot/updates/changesets.c           |  8 ++---
 src/libknot/updates/changesets.h           |  4 +--
 src/libknot/updates/ddns.c                 | 16 +++++-----
 src/libknot/updates/ddns.h                 | 12 ++++----
 src/libknot/updates/xfr-in.c               | 28 +++++++++---------
 src/libknot/updates/xfr-in.h               | 10 +++----
 src/libknot/util/debug.c                   |  4 +--
 src/libknot/util/debug.h                   |  8 ++---
 src/libknot/util/tolower.c                 |  2 +-
 src/libknot/util/utils.c                   |  4 +--
 src/libknot/util/utils.h                   |  2 +-
 src/libknot/util/wire.h                    |  2 +-
 src/libknot/zone/node.c                    |  8 ++---
 src/libknot/zone/node.h                    |  4 +--
 src/libknot/zone/zone-contents.c           |  6 ++--
 src/libknot/zone/zone-contents.h           |  6 ++--
 src/libknot/zone/zone-diff.c               |  2 +-
 src/libknot/zone/zone-tree.c               |  4 +--
 src/libknot/zone/zone-tree.h               |  2 +-
 src/libknot/zone/zone.c                    | 14 ++++-----
 src/libknot/zone/zone.h                    |  8 ++---
 src/libknot/zone/zonedb.c                  | 12 ++++----
 src/libknot/zone/zonedb.h                  |  6 ++--
 src/tests/Makefile.am                      |  3 +-
 src/tests/libknot/dnssec_zone_nsec_tests.c |  2 +-
 78 files changed, 261 insertions(+), 260 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b2ff2d3ed..959e285b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,9 +6,9 @@ bin_PROGRAMS = kdig khost knsupdate knsec3hash
 noinst_LTLIBRARIES = libknot.la libknotd.la libknots.la
 
 # $(YACC) will generate header file
-AM_CPPFLAGS = -I$(top_srcdir)/src/libknot -DSYSCONFDIR='"$(sysconfdir)"' \
-	-DSBINDIR='"$(sbindir)"' -DCONFIG_DIR='"${config_dir}"' \
-	-DSTORAGE_DIR='"${storage_dir}"' -DRUN_DIR='"${run_dir}"'
+AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"' \
+	      -DCONFIG_DIR='"${config_dir}"' -DSTORAGE_DIR='"${storage_dir}"' \
+	      -DRUN_DIR='"${run_dir}"'
 AM_YFLAGS = -d
 libknotd_la_YFLAGS = -pcf_ -d
 libknotd_la_LFLAGS = # TODO: reentrant parser, prefix
diff --git a/src/common/base32hex.c b/src/common/base32hex.c
index e1af3c739..d42f2fb73 100644
--- a/src/common/base32hex.c
+++ b/src/common/base32hex.c
@@ -15,8 +15,8 @@
  */
 
 #include <config.h>
-#include "base32hex.h"
-#include "errcode.h"
+#include "common/base32hex.h"
+#include "common/errcode.h"
 
 #include <stdlib.h>			// malloc
 #include <stdint.h>			// uint8_t
diff --git a/src/common/base64.c b/src/common/base64.c
index 3deee97f0..339b5f42e 100644
--- a/src/common/base64.c
+++ b/src/common/base64.c
@@ -15,8 +15,8 @@
  */
 
 #include <config.h>
-#include "base64.h"
-#include "errcode.h"
+#include "common/base64.h"
+#include "common/errcode.h"
 
 #include <stdlib.h>			// malloc
 #include <stdint.h>			// uint8_t
diff --git a/src/common/dSFMT-params.h b/src/common/dSFMT-params.h
index 3a4a8686d..7fd70bad9 100644
--- a/src/common/dSFMT-params.h
+++ b/src/common/dSFMT-params.h
@@ -1,7 +1,7 @@
 #ifndef DSFMT_PARAMS_H
 #define DSFMT_PARAMS_H
 
-#include "dSFMT.h"
+#include "common/dSFMT.h"
 
 /*----------------------
   the parameters of DSFMT
@@ -55,7 +55,7 @@
 #endif
 
 #if DSFMT_MEXP == 521
-  #include "dSFMT-params521.h"
+  #include "common/dSFMT-params521.h"
 #elif DSFMT_MEXP == 1279
   #include "dSFMT-params1279.h"
 #elif DSFMT_MEXP == 2203
diff --git a/src/common/dSFMT.c b/src/common/dSFMT.c
index 4b238b546..6e54b2e95 100644
--- a/src/common/dSFMT.c
+++ b/src/common/dSFMT.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "dSFMT-params.h"
+#include "common/dSFMT-params.h"
 
 /** dsfmt internal state vector */
 dsfmt_t dsfmt_global_data;
diff --git a/src/common/fdset.c b/src/common/fdset.c
index 5f93d278f..653d351d1 100644
--- a/src/common/fdset.c
+++ b/src/common/fdset.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <time.h>
 #include "common/fdset.h"
-#include "common.h"
+#include "libknot/common.h"
 
 /* Workarounds for clock_gettime() not available on some platforms. */
 #ifdef HAVE_CLOCK_GETTIME
diff --git a/src/common/hattrie/ahtable.c b/src/common/hattrie/ahtable.c
index e8e2b4571..0e8e24f3e 100644
--- a/src/common/hattrie/ahtable.c
+++ b/src/common/hattrie/ahtable.c
@@ -8,8 +8,8 @@
 #include <config.h>
 #include <assert.h>
 #include <string.h>
-#include "ahtable.h"
-#include "murmurhash3.h"
+#include "common/hattrie/ahtable.h"
+#include "common/hattrie/murmurhash3.h"
 
 enum {
     AH_SORTED  = 0x01,/* sorted iteration */
diff --git a/src/common/hattrie/ahtable.h b/src/common/hattrie/ahtable.h
index 6ab25e931..2a9f3d280 100644
--- a/src/common/hattrie/ahtable.h
+++ b/src/common/hattrie/ahtable.h
@@ -26,8 +26,8 @@ extern "C" {
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "common.h"
-#include "hat-trie.h"
+#include "libknot/common.h"
+#include "common/hattrie/hat-trie.h"
 
 typedef unsigned char* slot_t;
 
diff --git a/src/common/hattrie/hat-trie.c b/src/common/hattrie/hat-trie.c
index 419481fae..22f7276b4 100644
--- a/src/common/hattrie/hat-trie.c
+++ b/src/common/hattrie/hat-trie.c
@@ -9,8 +9,8 @@
 #include <stdint.h>
 #include <assert.h>
 #include <string.h>
-#include "hat-trie.h"
-#include "ahtable.h"
+#include "common/hattrie/hat-trie.h"
+#include "common/hattrie/ahtable.h"
 
 /* number of child nodes for used alphabet */
 #define NODE_CHILDS (TRIE_MAXCHAR+1)
diff --git a/src/common/hattrie/hat-trie.h b/src/common/hattrie/hat-trie.h
index 6214575fd..7a7762d64 100644
--- a/src/common/hattrie/hat-trie.h
+++ b/src/common/hattrie/hat-trie.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include "common.h"
+#include "libknot/common.h"
 #include "common/mempattern.h"
 
 /* Hat-trie defines. */
diff --git a/src/common/hattrie/murmurhash3.c b/src/common/hattrie/murmurhash3.c
index 73de0aefa..da33dc635 100644
--- a/src/common/hattrie/murmurhash3.c
+++ b/src/common/hattrie/murmurhash3.c
@@ -2,7 +2,7 @@
  * by its author, Austin Appleby. */
 
 #include <config.h>
-#include "murmurhash3.h"
+#include "common/hattrie/murmurhash3.h"
 
 static inline uint32_t fmix(uint32_t h)
 {
diff --git a/src/common/heap.c b/src/common/heap.c
index c8c7921e9..df627d364 100644
--- a/src/common/heap.c
+++ b/src/common/heap.c
@@ -38,7 +38,7 @@
  ***/
 
 #include <config.h>
-#include "heap.h"
+#include "common/heap.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/common/libtap/tap.c b/src/common/libtap/tap.c
index e89948b8d..0c925bc17 100644
--- a/src/common/libtap/tap.c
+++ b/src/common/libtap/tap.c
@@ -9,8 +9,8 @@ This file is licensed under the GPL v3
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "common.h"
-#include "tap.h"
+#include "libknot/common.h"
+#include "common/libtap/tap.h"
 
 static int expected_tests = NO_PLAN;
 static int failed_tests;
diff --git a/src/common/mempattern.c b/src/common/mempattern.c
index 2ea7e5044..5807cecfc 100644
--- a/src/common/mempattern.c
+++ b/src/common/mempattern.c
@@ -21,7 +21,7 @@
 #include <sys/resource.h>
 #include <stdarg.h>
 
-#include "mempattern.h"
+#include "common/mempattern.h"
 #include "common/log.h"
 #include "common/slab/alloc-common.h"
 
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 049b0161b..f5022f9b4 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -12,7 +12,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "mempool.h"
+#include "common/mempool.h"
 #include "common/mempattern.h"
 
 #include <string.h>
diff --git a/src/common/print.c b/src/common/print.c
index 4735e54a4..69703c660 100644
--- a/src/common/print.c
+++ b/src/common/print.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "print.h"
+#include "common/print.h"
 
 void array_printf(const uint8_t *data, const unsigned length,
                   printf_t print_handler, const char type)
diff --git a/src/common/prng.c b/src/common/prng.c
index c94bd25ea..04f33373e 100644
--- a/src/common/prng.c
+++ b/src/common/prng.c
@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #endif
 
-#include "common.h"
-#include "prng.h"
-#include "dSFMT.h"
+#include "libknot/common.h"
+#include "common/prng.h"
+#include "common/dSFMT.h"
 
 /*! \brief TLS unique key for each thread seed. */
 static pthread_key_t tls_prng_key;
diff --git a/src/common/ref.c b/src/common/ref.c
index a042665aa..33ea3f9d3 100644
--- a/src/common/ref.c
+++ b/src/common/ref.c
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <stdio.h>
 
-#include "ref.h"
+#include "common/ref.h"
 
 void ref_init(ref_t *p, ref_destructor_t dtor)
 {
diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y
index 74e51df6d..53e82e7c3 100644
--- a/src/knot/conf/cf-parse.y
+++ b/src/knot/conf/cf-parse.y
@@ -33,7 +33,7 @@
 #include "libknot/binary.h"
 #include "libknot/edns.h"
 #include "knot/conf/conf.h"
-#include "libknotd_la-cf-parse.h" /* Automake generated header. */
+#include "knot/conf/libknotd_la-cf-parse.h" /* Automake generated header. */
 
 extern int cf_lex (YYSTYPE *lvalp, void *scanner);
 extern void cf_error(void *scanner, const char *format, ...);
diff --git a/src/knot/ctl/remote.c b/src/knot/ctl/remote.c
index 00fb0a498..14c775623 100644
--- a/src/knot/ctl/remote.c
+++ b/src/knot/ctl/remote.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <sys/stat.h>
-#include "remote.h"
+#include "knot/ctl/remote.h"
 #include "common/log.h"
 #include "common/fdset.h"
 #include "common/prng.h"
diff --git a/src/knot/main.c b/src/knot/main.c
index 145b44de9..2702274f4 100644
--- a/src/knot/main.c
+++ b/src/knot/main.c
@@ -26,7 +26,7 @@
 #include <cap-ng.h>
 #endif /* HAVE_CAP_NG_H */
 
-#include "common.h"
+#include "libknot/common.h"
 #include "common/evqueue.h"
 #include "knot/knot.h"
 #include "knot/server/server.h"
diff --git a/src/knot/server/journal.c b/src/knot/server/journal.c
index d598dfcae..b9bd586bc 100644
--- a/src/knot/server/journal.c
+++ b/src/knot/server/journal.c
@@ -25,9 +25,9 @@
 #include <sys/mman.h>
 
 #include "common/crc.h"
-#include "common.h"
+#include "libknot/common.h"
 #include "knot/other/debug.h"
-#include "journal.h"
+#include "knot/server/journal.h"
 
 /*! \brief Infinite file size limit. */
 #define FSLIMIT_INF (~((size_t)0))
diff --git a/src/knot/zone/estimator.c b/src/knot/zone/estimator.c
index 0977babc2..e035496cd 100644
--- a/src/knot/zone/estimator.c
+++ b/src/knot/zone/estimator.c
@@ -17,8 +17,8 @@
 #include <config.h>
 #include <assert.h>
 
-#include "estimator.h"
-#include "dname.h"
+#include "knot/zone/estimator.h"
+#include "libknot/dname.h"
 #include "common/lists.h"
 #include "libknot/zone/node.h"
 #include "common/hattrie/ahtable.h"
diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index 09c19c3d0..7ac589e46 100644
--- a/src/knot/zone/semantic-check.c
+++ b/src/knot/zone/semantic-check.c
@@ -32,7 +32,7 @@
 #include "common/mempattern.h"
 #include "libknot/rdata.h"
 
-#include "semantic-check.h"
+#include "knot/zone/semantic-check.h"
 
 static char *error_messages[(-ZC_ERR_UNKNOWN) + 1] = {
 	[-ZC_ERR_MISSING_SOA] = "SOA record missing in zone!",
diff --git a/src/libknot/dname.c b/src/libknot/dname.c
index 86f92968d..7f4013cf4 100644
--- a/src/libknot/dname.c
+++ b/src/libknot/dname.c
@@ -22,14 +22,14 @@
 #include <ctype.h>
 #include <inttypes.h>
 
-#include "common.h"
+#include "libknot/common.h"
 #include "common/mempattern.h"
-#include "dname.h"
-#include "consts.h"
-#include "util/tolower.h"
-#include "util/debug.h"
-#include "util/utils.h"
-#include "util/wire.h"
+#include "libknot/dname.h"
+#include "libknot/consts.h"
+#include "libknot/util/tolower.h"
+#include "libknot/util/debug.h"
+#include "libknot/util/utils.h"
+#include "libknot/util/wire.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libknot/dnssec/key.c b/src/libknot/dnssec/key.c
index fc673d5c6..cf5082940 100644
--- a/src/libknot/dnssec/key.c
+++ b/src/libknot/dnssec/key.c
@@ -27,13 +27,13 @@
 #include <string.h>
 #include <time.h>
 
-#include "binary.h"
-#include "common.h"
 #include "common/getline.h"
-#include "dname.h"
-#include "key.h"
-#include "sig0.h"
-#include "tsig.h"
+#include "libknot/binary.h"
+#include "libknot/common.h"
+#include "libknot/dname.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/sig0.h"
+#include "libknot/tsig.h"
 #include "zscanner/zscanner.h"
 
 /*!
diff --git a/src/libknot/dnssec/key.h b/src/libknot/dnssec/key.h
index d2880b50c..6f604f71f 100644
--- a/src/libknot/dnssec/key.h
+++ b/src/libknot/dnssec/key.h
@@ -29,9 +29,9 @@
 
 #include <stdint.h>
 #include <time.h>
-#include "dname.h"
-#include "binary.h"
-#include "tsig.h"
+#include "libknot/dname.h"
+#include "libknot/binary.h"
+#include "libknot/tsig.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libknot/dnssec/nsec3.c b/src/libknot/dnssec/nsec3.c
index e7e849506..69d2bdcc1 100644
--- a/src/libknot/dnssec/nsec3.c
+++ b/src/libknot/dnssec/nsec3.c
@@ -22,13 +22,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "common/descriptor.h"
 #include "common/memdup.h"
+#include "libknot/common.h"
 #include "libknot/dnssec/algorithm.h"
 #include "libknot/dnssec/nsec3.h"
 #include "libknot/rdata.h"
-#include "util/tolower.h"
+#include "libknot/util/tolower.h"
 
 /*!
  * \brief Compute NSEC3 SHA1 hash.
diff --git a/src/libknot/dnssec/nsec3.h b/src/libknot/dnssec/nsec3.h
index 96f4d3e63..76a444beb 100644
--- a/src/libknot/dnssec/nsec3.h
+++ b/src/libknot/dnssec/nsec3.h
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "libknot/dnssec/algorithm.h"
-#include "rrset.h"
+#include "libknot/rrset.h"
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/src/libknot/dnssec/sig0.c b/src/libknot/dnssec/sig0.c
index f78246d23..b84ac8907 100644
--- a/src/libknot/dnssec/sig0.c
+++ b/src/libknot/dnssec/sig0.c
@@ -18,9 +18,9 @@
 #include <assert.h>
 #include <time.h>
 #include "common/errcode.h"
-#include "sig0.h"
-#include "sign.h"
-#include "util/wire.h"
+#include "libknot/dnssec/sig0.h"
+#include "libknot/dnssec/sign.h"
+#include "libknot/util/wire.h"
 
 /*!
  * \brief Lifetime fudge of the SIG(0) packets in seconds.
diff --git a/src/libknot/dnssec/sign.c b/src/libknot/dnssec/sign.c
index ea8377319..f6954ee84 100644
--- a/src/libknot/dnssec/sign.c
+++ b/src/libknot/dnssec/sign.c
@@ -15,12 +15,6 @@
 */
 
 #include <config.h>
-#include "common.h"
-#include "common/descriptor.h"
-#include "common/errcode.h"
-#include "libknot/dnssec/algorithm.h"
-#include "libknot/dnssec/key.h"
-#include "libknot/dnssec/sign.h"
 #include <assert.h>
 #include <openssl/dsa.h>
 #include <openssl/opensslconf.h>
@@ -29,6 +23,12 @@
 #endif
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
+#include "common/descriptor.h"
+#include "common/errcode.h"
+#include "libknot/common.h"
+#include "libknot/dnssec/algorithm.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/sign.h"
 
 struct algorithm_functions;
 typedef struct algorithm_functions algorithm_functions_t;
diff --git a/src/libknot/dnssec/zone-events.c b/src/libknot/dnssec/zone-events.c
index ae5d5cac9..7470d715e 100644
--- a/src/libknot/dnssec/zone-events.c
+++ b/src/libknot/dnssec/zone-events.c
@@ -19,13 +19,13 @@
 #include <time.h>
 #include "knot/conf/conf.h"
 #include "knot/server/zones.h"
+#include "libknot/dnssec/policy.h"
 #include "libknot/dnssec/zone-events.h"
+#include "libknot/dnssec/zone-keys.h"
 #include "libknot/dnssec/zone-nsec.h"
 #include "libknot/dnssec/zone-sign.h"
-#include "libknot/dnssec/zone-keys.h"
-#include "libknot/dnssec/policy.h"
-#include "libknot/zone/zone.h"
 #include "libknot/util/debug.h"
+#include "libknot/zone/zone.h"
 
 static uint32_t time_now(void)
 {
diff --git a/src/libknot/dnssec/zone-sign.c b/src/libknot/dnssec/zone-sign.c
index 867ce6980..2bfd73465 100644
--- a/src/libknot/dnssec/zone-sign.c
+++ b/src/libknot/dnssec/zone-sign.c
@@ -22,16 +22,16 @@
 #include <time.h>
 #include "common/descriptor.h"
 #include "common/errcode.h"
-#include "common/hattrie/hat-trie.h"
 #include "common/hattrie/ahtable.h"
+#include "common/hattrie/hat-trie.h"
 #include "libknot/dname.h"
-#include "libknot/rdata.h"
-#include "libknot/dnssec/zone-sign.h"
 #include "libknot/dnssec/key.h"
 #include "libknot/dnssec/policy.h"
 #include "libknot/dnssec/rrset-sign.h"
 #include "libknot/dnssec/sign.h"
 #include "libknot/dnssec/zone-keys.h"
+#include "libknot/dnssec/zone-sign.h"
+#include "libknot/rdata.h"
 #include "libknot/rrset.h"
 #include "libknot/updates/changesets.h"
 #include "libknot/util/debug.h"
diff --git a/src/libknot/edns.c b/src/libknot/edns.c
index 5a36a84af..003371a88 100644
--- a/src/libknot/edns.c
+++ b/src/libknot/edns.c
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "edns.h"
-#include "common.h"
+#include "libknot/edns.h"
+#include "libknot/common.h"
 #include "common/descriptor.h"
-#include "util/debug.h"
+#include "libknot/util/debug.h"
 
 /*! \brief Various EDNS constatns. */
 enum knot_edns_consts {
diff --git a/src/libknot/edns.h b/src/libknot/edns.h
index d3631ba08..58e469354 100644
--- a/src/libknot/edns.h
+++ b/src/libknot/edns.h
@@ -29,8 +29,8 @@
 
 #include <stdint.h>
 
-#include "util/utils.h"
-#include "rrset.h"
+#include "libknot/util/utils.h"
+#include "libknot/rrset.h"
 
 /*----------------------------------------------------------------------------*/
 /*! \brief Structure representing one OPT RR Option. */
diff --git a/src/libknot/libknot.h b/src/libknot/libknot.h
index 4cd785d5d..2a712786a 100644
--- a/src/libknot/libknot.h
+++ b/src/libknot/libknot.h
@@ -27,23 +27,23 @@
 #ifndef _KNOT_LIBKNOT_H_
 #define _KNOT_LIBKNOT_H_
 
-#include "consts.h"
-#include "dname.h"
-#include "edns.h"
-#include "packet/packet.h"
-#include "packet/query.h"
-#include "packet/response.h"
-#include "rrset.h"
-#include "rrset-dump.h"
-#include "tsig.h"
-#include "tsig-op.h"
-#include "util/tolower.h"
-#include "util/utils.h"
-#include "util/wire.h"
-#include "zone/node.h"
-#include "zone/zone.h"
-#include "zone/zonedb.h"
-#include "rdata.h"
+#include "libknot/consts.h"
+#include "libknot/dname.h"
+#include "libknot/edns.h"
+#include "libknot/packet/packet.h"
+#include "libknot/packet/query.h"
+#include "libknot/packet/response.h"
+#include "libknot/rrset.h"
+#include "libknot/rrset-dump.h"
+#include "libknot/tsig.h"
+#include "libknot/tsig-op.h"
+#include "libknot/util/tolower.h"
+#include "libknot/util/utils.h"
+#include "libknot/util/wire.h"
+#include "libknot/zone/node.h"
+#include "libknot/zone/zone.h"
+#include "libknot/zone/zonedb.h"
+#include "libknot/rdata.h"
 
 #endif
 
diff --git a/src/libknot/nameserver/chaos.c b/src/libknot/nameserver/chaos.c
index 44ca6adb7..e76c0b096 100644
--- a/src/libknot/nameserver/chaos.c
+++ b/src/libknot/nameserver/chaos.c
@@ -17,10 +17,10 @@
 #include <config.h>
 #include <strings.h>
 
-#include "chaos.h"
+#include "libknot/nameserver/chaos.h"
 #include "common/descriptor.h"
-#include "packet/packet.h"
-#include "packet/response.h"
+#include "libknot/packet/packet.h"
+#include "libknot/packet/response.h"
 
 /*!
  * \brief Get a string result for a given TXT query.
diff --git a/src/libknot/nameserver/chaos.h b/src/libknot/nameserver/chaos.h
index 3f7526081..42b296754 100644
--- a/src/libknot/nameserver/chaos.h
+++ b/src/libknot/nameserver/chaos.h
@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "name-server.h"
-#include "packet/packet.h"
+#include "libknot/nameserver/name-server.h"
+#include "libknot/packet/packet.h"
 
 /*!
  * \brief Create a response for a given query in the CHAOS class.
diff --git a/src/libknot/nameserver/name-server.c b/src/libknot/nameserver/name-server.c
index 287b34e51..138cbaf52 100644
--- a/src/libknot/nameserver/name-server.c
+++ b/src/libknot/nameserver/name-server.c
@@ -21,22 +21,22 @@
 
 #include <urcu.h>
 
-#include "nameserver/name-server.h"
-#include "updates/xfr-in.h"
+#include "libknot/nameserver/name-server.h"
+#include "libknot/updates/xfr-in.h"
 
-#include "libknot.h"
+#include "libknot/libknot.h"
 #include "common/errcode.h"
-#include "common.h"
+#include "libknot/common.h"
 #include "common/lists.h"
-#include "util/debug.h"
-#include "packet/packet.h"
-#include "packet/response.h"
-#include "packet/query.h"
-#include "consts.h"
+#include "libknot/util/debug.h"
+#include "libknot/packet/packet.h"
+#include "libknot/packet/response.h"
+#include "libknot/packet/query.h"
+#include "libknot/consts.h"
 #include "common/descriptor.h"
-#include "updates/changesets.h"
-#include "updates/ddns.h"
-#include "tsig-op.h"
+#include "libknot/updates/changesets.h"
+#include "libknot/updates/ddns.h"
+#include "libknot/tsig-op.h"
 #include "libknot/rdata.h"
 #include "libknot/dnssec/zone-nsec.h"
 
diff --git a/src/libknot/nameserver/name-server.h b/src/libknot/nameserver/name-server.h
index 1c7bb7af7..48e900405 100644
--- a/src/libknot/nameserver/name-server.h
+++ b/src/libknot/nameserver/name-server.h
@@ -39,14 +39,14 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "zone/zonedb.h"
-#include "edns.h"
-#include "consts.h"
-#include "tsig.h"
-#include "packet/packet.h"
+#include "libknot/zone/zonedb.h"
+#include "libknot/edns.h"
+#include "libknot/consts.h"
+#include "libknot/tsig.h"
+#include "libknot/packet/packet.h"
 #include "common/sockaddr.h"
 #include "common/lists.h"
-#include "updates/changesets.h"
+#include "libknot/updates/changesets.h"
 
 struct conf_t;
 struct server_t;
diff --git a/src/libknot/packet/packet.c b/src/libknot/packet/packet.c
index 2bb3e5afd..7e7b9027a 100644
--- a/src/libknot/packet/packet.c
+++ b/src/libknot/packet/packet.c
@@ -18,12 +18,12 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "packet/packet.h"
-#include "util/debug.h"
-#include "common.h"
+#include "libknot/packet/packet.h"
+#include "libknot/util/debug.h"
+#include "libknot/common.h"
 #include "common/descriptor.h"
-#include "util/wire.h"
-#include "tsig.h"
+#include "libknot/util/wire.h"
+#include "libknot/tsig.h"
 
 /*----------------------------------------------------------------------------*/
 /* Non-API functions                                                          */
diff --git a/src/libknot/packet/packet.h b/src/libknot/packet/packet.h
index e86afc9e1..019be68ed 100644
--- a/src/libknot/packet/packet.h
+++ b/src/libknot/packet/packet.h
@@ -30,11 +30,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "dname.h"
-#include "rrset.h"
-#include "edns.h"
-#include "zone/node.h"
-#include "zone/zone.h"
+#include "libknot/dname.h"
+#include "libknot/rrset.h"
+#include "libknot/edns.h"
+#include "libknot/zone/node.h"
+#include "libknot/zone/zone.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libknot/packet/query.c b/src/libknot/packet/query.c
index 7ddf5295f..12a1cc810 100644
--- a/src/libknot/packet/query.c
+++ b/src/libknot/packet/query.c
@@ -16,8 +16,8 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include "packet/query.h"
-#include "util/wire.h"
+#include "libknot/packet/query.h"
+#include "libknot/util/wire.h"
 #include "libknot/common.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libknot/packet/query.h b/src/libknot/packet/query.h
index 0c021731c..b99ca1a5a 100644
--- a/src/libknot/packet/query.h
+++ b/src/libknot/packet/query.h
@@ -30,10 +30,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "packet/packet.h"
-#include "dname.h"
-#include "rrset.h"
-#include "edns.h"
+#include "libknot/packet/packet.h"
+#include "libknot/dname.h"
+#include "libknot/rrset.h"
+#include "libknot/edns.h"
 
 /*----------------------------------------------------------------------------*/
 /*!
diff --git a/src/libknot/packet/response.c b/src/libknot/packet/response.c
index 6367f720f..90a4f0420 100644
--- a/src/libknot/packet/response.c
+++ b/src/libknot/packet/response.c
@@ -18,13 +18,13 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "packet/response.h"
-#include "util/wire.h"
-#include "common.h"
-#include "util/debug.h"
-#include "rrset.h"
-#include "packet/packet.h"
-#include "edns.h"
+#include "libknot/packet/response.h"
+#include "libknot/util/wire.h"
+#include "libknot/common.h"
+#include "libknot/util/debug.h"
+#include "libknot/rrset.h"
+#include "libknot/packet/packet.h"
+#include "libknot/edns.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libknot/packet/response.h b/src/libknot/packet/response.h
index e499b52be..a29868fb4 100644
--- a/src/libknot/packet/response.h
+++ b/src/libknot/packet/response.h
@@ -30,11 +30,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "packet/packet.h"
+#include "libknot/packet/packet.h"
 
-#include "dname.h"
-#include "rrset.h"
-#include "edns.h"
+#include "libknot/dname.h"
+#include "libknot/rrset.h"
+#include "libknot/edns.h"
 
 /*!
  * \brief Holds information about compressed domain name.
diff --git a/src/libknot/rdata.h b/src/libknot/rdata.h
index 980b3293b..7c736981b 100644
--- a/src/libknot/rdata.h
+++ b/src/libknot/rdata.h
@@ -28,9 +28,9 @@
 #define _KNOT_RDATA_H_
 
 #include "common/descriptor.h"
-#include "dname.h"
-#include "rrset.h"
-#include "util/utils.h"
+#include "libknot/dname.h"
+#include "libknot/rrset.h"
+#include "libknot/util/utils.h"
 
 static inline
 const knot_dname_t *knot_rdata_cname_name(const knot_rrset_t *rrset)
diff --git a/src/libknot/rrset.c b/src/libknot/rrset.c
index 34cf15d63..edad78567 100644
--- a/src/libknot/rrset.c
+++ b/src/libknot/rrset.c
@@ -22,16 +22,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "consts.h"
-#include "common.h"
+#include "libknot/consts.h"
+#include "libknot/common.h"
 #include "common/mempattern.h"
-#include "rrset.h"
+#include "libknot/rrset.h"
 #include "libknot/rrset-dump.h"
 #include "common/descriptor.h"
-#include "util/debug.h"
-#include "util/utils.h"
-#include "packet/response.h"
-#include "util/wire.h"
+#include "libknot/util/debug.h"
+#include "libknot/util/utils.h"
+#include "libknot/packet/response.h"
+#include "libknot/util/wire.h"
 #include "libknot/dname.h"
 #include "libknot/rdata.h"
 
diff --git a/src/libknot/rrset.h b/src/libknot/rrset.h
index e77d51e22..5ab1629f3 100644
--- a/src/libknot/rrset.h
+++ b/src/libknot/rrset.h
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "dname.h"
+#include "libknot/dname.h"
 
 /*----------------------------------------------------------------------------*/
 /*!
diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c
index 482ebd548..f136dd3a2 100644
--- a/src/libknot/tsig-op.c
+++ b/src/libknot/tsig-op.c
@@ -22,13 +22,13 @@
 #include <time.h>
 #include <inttypes.h>
 
-#include "common.h"
+#include "libknot/common.h"
 #include "common/descriptor.h"
-#include "tsig.h"
-#include "tsig-op.h"
-#include "util/wire.h"
-#include "util/debug.h"
-#include "consts.h"
+#include "libknot/tsig.h"
+#include "libknot/tsig-op.h"
+#include "libknot/util/wire.h"
+#include "libknot/util/debug.h"
+#include "libknot/consts.h"
 #include "libknot/dnssec/key.h"
 
 const int KNOT_TSIG_MAX_DIGEST_SIZE = 64;    // size of HMAC-SHA512 digest
diff --git a/src/libknot/tsig-op.h b/src/libknot/tsig-op.h
index 1cbdcacf0..a3df9482a 100644
--- a/src/libknot/tsig-op.h
+++ b/src/libknot/tsig-op.h
@@ -29,8 +29,8 @@
 
 #include <stdint.h>
 
-#include "tsig.h"
-#include "rrset.h"
+#include "libknot/tsig.h"
+#include "libknot/rrset.h"
 #include "libknot/dnssec/key.h"
 
 /*!
diff --git a/src/libknot/tsig.c b/src/libknot/tsig.c
index 4d3d9b9ea..31a02abcf 100644
--- a/src/libknot/tsig.c
+++ b/src/libknot/tsig.c
@@ -22,13 +22,13 @@
 #include <assert.h>
 #include <time.h>
 
-#include "tsig.h"
-#include "util/debug.h"
-#include "common.h"
-#include "util/utils.h"
-#include "rrset.h"
-#include "dname.h"
-#include "consts.h"
+#include "libknot/tsig.h"
+#include "libknot/util/debug.h"
+#include "libknot/common.h"
+#include "libknot/util/utils.h"
+#include "libknot/rrset.h"
+#include "libknot/dname.h"
+#include "libknot/consts.h"
 
 /*! \brief TSIG field offsets. */
 typedef enum tsig_off_t {
diff --git a/src/libknot/tsig.h b/src/libknot/tsig.h
index 95cc54f14..580370080 100644
--- a/src/libknot/tsig.h
+++ b/src/libknot/tsig.h
@@ -29,9 +29,9 @@
 
 #include <stdint.h>
 
-#include "rrset.h"
-#include "binary.h"
-#include "util/utils.h"
+#include "libknot/rrset.h"
+#include "libknot/binary.h"
+#include "libknot/util/utils.h"
 #include "libknot/consts.h"
 
 struct knot_tsig_key {
diff --git a/src/libknot/updates/changesets.c b/src/libknot/updates/changesets.c
index afd0e9c54..a9f9dd2e7 100644
--- a/src/libknot/updates/changesets.c
+++ b/src/libknot/updates/changesets.c
@@ -19,14 +19,14 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "updates/changesets.h"
+#include "libknot/updates/changesets.h"
 #include "libknot/common.h"
 #include "common/descriptor.h"
 #include "common/mempattern.h"
 #include "common/mempool.h"
-#include "rrset.h"
-#include "util/debug.h"
-#include "rdata.h"
+#include "libknot/rrset.h"
+#include "libknot/util/debug.h"
+#include "libknot/rdata.h"
 
 static int knot_changeset_rrsets_match(const knot_rrset_t *rrset1,
                                          const knot_rrset_t *rrset2)
diff --git a/src/libknot/updates/changesets.h b/src/libknot/updates/changesets.h
index a730d265b..32fa6b86d 100644
--- a/src/libknot/updates/changesets.h
+++ b/src/libknot/updates/changesets.h
@@ -27,8 +27,8 @@
 #ifndef _KNOT_CHANGESETS_H_
 #define _KNOT_CHANGESETS_H_
 
-#include "rrset.h"
-#include "zone/node.h"
+#include "libknot/rrset.h"
+#include "libknot/zone/node.h"
 #include "common/lists.h"
 #include "common/mempattern.h"
 
diff --git a/src/libknot/updates/ddns.c b/src/libknot/updates/ddns.c
index bb7ad9dd6..6919eaa4b 100644
--- a/src/libknot/updates/ddns.c
+++ b/src/libknot/updates/ddns.c
@@ -19,16 +19,16 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#include "updates/ddns.h"
-#include "updates/changesets.h"
+#include "libknot/updates/ddns.h"
+#include "libknot/updates/changesets.h"
 #include "libknot/rdata.h"
-#include "util/debug.h"
-#include "packet/packet.h"
-#include "common.h"
-#include "consts.h"
+#include "libknot/util/debug.h"
+#include "libknot/packet/packet.h"
+#include "libknot/common.h"
+#include "libknot/consts.h"
 #include "common/mempattern.h"
-#include "nameserver/name-server.h"  // ns_serial_compare() - TODO: extract
-#include "updates/xfr-in.h"
+#include "libknot/nameserver/name-server.h"  // ns_serial_compare() - TODO: extract
+#include "libknot/updates/xfr-in.h"
 #include "common/descriptor.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libknot/updates/ddns.h b/src/libknot/updates/ddns.h
index 985e5d04c..114e1be05 100644
--- a/src/libknot/updates/ddns.h
+++ b/src/libknot/updates/ddns.h
@@ -27,12 +27,12 @@
 #ifndef _KNOT_DDNS_H_
 #define _KNOT_DDNS_H_
 
-#include "updates/changesets.h"
-#include "zone/zone.h"
-#include "packet/packet.h"
-#include "rrset.h"
-#include "dname.h"
-#include "consts.h"
+#include "libknot/updates/changesets.h"
+#include "libknot/zone/zone.h"
+#include "libknot/packet/packet.h"
+#include "libknot/rrset.h"
+#include "libknot/dname.h"
+#include "libknot/consts.h"
 #include "common/lists.h"
 
 typedef struct knot_ddns_prereq_t {
diff --git a/src/libknot/updates/xfr-in.c b/src/libknot/updates/xfr-in.c
index 4391ea718..85cc4c99e 100644
--- a/src/libknot/updates/xfr-in.c
+++ b/src/libknot/updates/xfr-in.c
@@ -20,23 +20,23 @@
 
 #include "knot/server/journal.h"
 
-#include "updates/xfr-in.h"
-
-#include "nameserver/name-server.h"
-#include "util/wire.h"
-#include "util/debug.h"
-#include "packet/packet.h"
-#include "dname.h"
-#include "zone/zone.h"
+#include "libknot/updates/xfr-in.h"
+
+#include "libknot/nameserver/name-server.h"
+#include "libknot/util/wire.h"
+#include "libknot/util/debug.h"
+#include "libknot/packet/packet.h"
+#include "libknot/dname.h"
+#include "libknot/zone/zone.h"
 #include "libknot/dnssec/zone-nsec.h"
-#include "packet/query.h"
-#include "common.h"
-#include "updates/changesets.h"
-#include "tsig.h"
-#include "tsig-op.h"
+#include "libknot/packet/query.h"
+#include "libknot/common.h"
+#include "libknot/updates/changesets.h"
+#include "libknot/tsig.h"
+#include "libknot/tsig-op.h"
 #include "common/lists.h"
 #include "common/descriptor.h"
-#include "rdata.h"
+#include "libknot/rdata.h"
 
 /*----------------------------------------------------------------------------*/
 /* Non-API functions                                                          */
diff --git a/src/libknot/updates/xfr-in.h b/src/libknot/updates/xfr-in.h
index 7cfb91e68..99db82a07 100644
--- a/src/libknot/updates/xfr-in.h
+++ b/src/libknot/updates/xfr-in.h
@@ -30,11 +30,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "dname.h"
-#include "zone/zone.h"
-#include "packet/packet.h"
-#include "nameserver/name-server.h"
-#include "updates/changesets.h"
+#include "libknot/dname.h"
+#include "libknot/zone/zone.h"
+#include "libknot/packet/packet.h"
+#include "libknot/nameserver/name-server.h"
+#include "libknot/updates/changesets.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libknot/util/debug.c b/src/libknot/util/debug.c
index 97c9e5af4..5ea40bf46 100644
--- a/src/libknot/util/debug.c
+++ b/src/libknot/util/debug.c
@@ -20,8 +20,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "util/utils.h"
-#include "util/debug.h"
+#include "libknot/util/utils.h"
+#include "libknot/util/debug.h"
 #include "libknot/rrset.h"
 #include "common/descriptor.h"
 #include "common/print.h"
diff --git a/src/libknot/util/debug.h b/src/libknot/util/debug.h
index f4a51a292..b4eeb0a7d 100644
--- a/src/libknot/util/debug.h
+++ b/src/libknot/util/debug.h
@@ -73,10 +73,10 @@
 /* KNOT_DNAME_DEBUG -- in configure.ac */
 /* #define KNOT_DDNS_DEBUG -- \todo Use this or delete. */
 
-#include "rrset.h"
-#include "zone/node.h"
-#include "zone/zone.h"
-#include "util/utils.h"
+#include "libknot/rrset.h"
+#include "libknot/zone/node.h"
+#include "libknot/zone/zone.h"
+#include "libknot/util/utils.h"
 #include "common/print.h"
 
 /*!
diff --git a/src/libknot/util/tolower.c b/src/libknot/util/tolower.c
index a12918dfb..5255f9e44 100644
--- a/src/libknot/util/tolower.c
+++ b/src/libknot/util/tolower.c
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "util/tolower.h"
+#include "libknot/util/tolower.h"
 
 const uint8_t char_table[KNOT_CHAR_TABLE_SIZE] = {
 	'\x00',
diff --git a/src/libknot/util/utils.c b/src/libknot/util/utils.c
index e64e2974a..6cfce2478 100644
--- a/src/libknot/util/utils.c
+++ b/src/libknot/util/utils.c
@@ -20,8 +20,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "util/utils.h"
+#include "libknot/common.h"
+#include "libknot/util/utils.h"
 #include "common/prng.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libknot/util/utils.h b/src/libknot/util/utils.h
index 0aa7a5584..dffa9ec5c 100644
--- a/src/libknot/util/utils.h
+++ b/src/libknot/util/utils.h
@@ -27,7 +27,7 @@
 #ifndef _KNOT_UTILS_H_
 #define _KNOT_UTILS_H_
 
-#include "util/endian.h"
+#include "libknot/util/endian.h"
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/libknot/util/wire.h b/src/libknot/util/wire.h
index a556636d1..ba4f6c33c 100644
--- a/src/libknot/util/wire.h
+++ b/src/libknot/util/wire.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "util/utils.h"
+#include "libknot/util/utils.h"
 
 /*! \brief Offset of DNS header fields in wireformat. */
 enum knot_wire_offsets {
diff --git a/src/libknot/zone/node.c b/src/libknot/zone/node.c
index 3c6556d46..07fa56ff3 100644
--- a/src/libknot/zone/node.c
+++ b/src/libknot/zone/node.c
@@ -21,11 +21,11 @@
 
 #include <urcu.h>
 
-#include "common.h"
-#include "zone/node.h"
-#include "rrset.h"
+#include "libknot/common.h"
+#include "libknot/zone/node.h"
+#include "libknot/rrset.h"
 #include "common/descriptor.h"
-#include "util/debug.h"
+#include "libknot/util/debug.h"
 #include "common/hattrie/ahtable.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libknot/zone/node.h b/src/libknot/zone/node.h
index 69fa491ca..d4c4dfe78 100644
--- a/src/libknot/zone/node.h
+++ b/src/libknot/zone/node.h
@@ -28,8 +28,8 @@
 #ifndef _KNOT_NODE_H_
 #define _KNOT_NODE_H_
 
-#include "dname.h"
-#include "rrset.h"
+#include "libknot/dname.h"
+#include "libknot/rrset.h"
 #include "common/hattrie/ahtable.h"
 
 struct knot_zone;
diff --git a/src/libknot/zone/zone-contents.c b/src/libknot/zone/zone-contents.c
index d35d0615e..53e586c91 100644
--- a/src/libknot/zone/zone-contents.c
+++ b/src/libknot/zone/zone-contents.c
@@ -17,8 +17,8 @@
 #include <config.h>
 #include <assert.h>
 
-#include "zone/zone-contents.h"
-#include "util/debug.h"
+#include "libknot/zone/zone-contents.h"
+#include "libknot/util/debug.h"
 #include "libknot/rrset.h"
 #include "common/base32hex.h"
 #include "common/descriptor.h"
@@ -26,7 +26,7 @@
 #include "libknot/dnssec/zone-nsec.h"
 #include "libknot/zone/zone-tree.h"
 #include "libknot/util/wire.h"
-#include "consts.h"
+#include "libknot/consts.h"
 #include "libknot/rdata.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libknot/zone/zone-contents.h b/src/libknot/zone/zone-contents.h
index 8ac80e00e..b3c13e02e 100644
--- a/src/libknot/zone/zone-contents.h
+++ b/src/libknot/zone/zone-contents.h
@@ -27,11 +27,11 @@
 #ifndef _KNOT_ZONE_CONTENTS_H_
 #define _KNOT_ZONE_CONTENTS_H_
 
-#include "zone/node.h"
-#include "dname.h"
+#include "libknot/zone/node.h"
+#include "libknot/dname.h"
 #include "libknot/dnssec/nsec3.h"
 
-#include "zone-tree.h"
+#include "libknot/zone/zone-tree.h"
 
 struct knot_zone;
 
diff --git a/src/libknot/zone/zone-diff.c b/src/libknot/zone/zone-diff.c
index 860d9e26f..78396732d 100644
--- a/src/libknot/zone/zone-diff.c
+++ b/src/libknot/zone/zone-diff.c
@@ -21,7 +21,7 @@
 
 #include "libknot/util/debug.h"
 #include "common/errcode.h"
-#include "zone-diff.h"
+#include "libknot/zone/zone-diff.h"
 #include "libknot/nameserver/name-server.h"
 #include "common/descriptor.h"
 #include "libknot/rdata.h"
diff --git a/src/libknot/zone/zone-tree.c b/src/libknot/zone/zone-tree.c
index c33731bc3..c744180f5 100644
--- a/src/libknot/zone/zone-tree.c
+++ b/src/libknot/zone/zone-tree.c
@@ -19,8 +19,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "zone/node.h"
-#include "util/debug.h"
+#include "libknot/zone/node.h"
+#include "libknot/util/debug.h"
 #include "common/hattrie/hat-trie.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libknot/zone/zone-tree.h b/src/libknot/zone/zone-tree.h
index 8e15d88b9..3061690ff 100644
--- a/src/libknot/zone/zone-tree.h
+++ b/src/libknot/zone/zone-tree.h
@@ -30,7 +30,7 @@
 #define _KNOT_ZONE_TREE_H_
 
 #include "common/hattrie/hat-trie.h"
-#include "zone/node.h"
+#include "libknot/zone/node.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libknot/zone/zone.c b/src/libknot/zone/zone.c
index b46b3533a..c45849844 100644
--- a/src/libknot/zone/zone.c
+++ b/src/libknot/zone/zone.c
@@ -21,13 +21,13 @@
 
 #include <urcu.h>
 
-#include "common.h"
-#include "zone/zone.h"
-#include "zone/node.h"
-#include "dname.h"
-#include "util/debug.h"
-#include "util/utils.h"
-#include "zone/zone-contents.h"
+#include "libknot/common.h"
+#include "libknot/zone/zone.h"
+#include "libknot/zone/node.h"
+#include "libknot/dname.h"
+#include "libknot/util/debug.h"
+#include "libknot/util/utils.h"
+#include "libknot/zone/zone-contents.h"
 
 /*! \brief Adaptor for knot_zone_deep_free() */
 static void knot_zone_dtor(struct ref_t *p) {
diff --git a/src/libknot/zone/zone.h b/src/libknot/zone/zone.h
index 834e094e2..90cdf87fc 100644
--- a/src/libknot/zone/zone.h
+++ b/src/libknot/zone/zone.h
@@ -29,14 +29,14 @@
 
 #include <time.h>
 
-#include "zone/node.h"
-#include "dname.h"
+#include "libknot/zone/node.h"
+#include "libknot/dname.h"
 #include "libknot/dnssec/nsec3.h"
 #include "common/ref.h"
 
-#include "zone-tree.h"
+#include "libknot/zone/zone-tree.h"
 
-#include "zone/zone-contents.h"
+#include "libknot/zone/zone-contents.h"
 
 /*----------------------------------------------------------------------------*/
 /*!
diff --git a/src/libknot/zone/zonedb.c b/src/libknot/zone/zonedb.c
index bbcaf7967..a2540055d 100644
--- a/src/libknot/zone/zonedb.c
+++ b/src/libknot/zone/zonedb.c
@@ -20,12 +20,12 @@
 
 #include <urcu.h>
 
-#include "common.h"
-#include "zone/zone.h"
-#include "zone/zonedb.h"
-#include "dname.h"
-#include "zone/node.h"
-#include "util/debug.h"
+#include "libknot/common.h"
+#include "libknot/zone/zone.h"
+#include "libknot/zone/zonedb.h"
+#include "libknot/dname.h"
+#include "libknot/zone/node.h"
+#include "libknot/util/debug.h"
 
 /*----------------------------------------------------------------------------*/
 /* Non-API functions                                                          */
diff --git a/src/libknot/zone/zonedb.h b/src/libknot/zone/zonedb.h
index 186c71855..e1cfa13eb 100644
--- a/src/libknot/zone/zonedb.h
+++ b/src/libknot/zone/zonedb.h
@@ -31,9 +31,9 @@
 #define _KNOT_ZONEDB_H_
 
 #include "common/hattrie/hat-trie.h"
-#include "zone/zone.h"
-#include "zone/node.h"
-#include "dname.h"
+#include "libknot/zone/zone.h"
+#include "libknot/zone/node.h"
+#include "libknot/dname.h"
 
 /*!
  * \brief Zone database structure. Contains all zones managed by the server.
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1931bdb2e..e32654251 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/libknot -I$(top_srcdir)/src -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"'
+AM_CPPFLAGS = -I$(top_srcdir)/src \
+	      -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"'
 
 check_PROGRAMS = 			\
 	unittests
diff --git a/src/tests/libknot/dnssec_zone_nsec_tests.c b/src/tests/libknot/dnssec_zone_nsec_tests.c
index e91b82bd5..aef3a1112 100644
--- a/src/tests/libknot/dnssec_zone_nsec_tests.c
+++ b/src/tests/libknot/dnssec_zone_nsec_tests.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "dnssec_zone_nsec_tests.h"
+#include "tests/libknot/dnssec_zone_nsec_tests.h"
 #include "libknot/dname.h"
 #include "libknot/dnssec/zone-nsec.h"
 
-- 
GitLab