diff --git a/Knot.files b/Knot.files
index bcc104d215bd6ff681443f2a54330591ed215fa7..23cc90bc6d2c29fcdc3f612e99936f91ce59374f 100644
--- a/Knot.files
+++ b/Knot.files
@@ -24,55 +24,49 @@ man/Makefile.am
 patches/Makefile.am
 samples/Makefile.am
 src/Makefile.am
-src/common/array-sort.h
 src/common/base32hex.c
 src/common/base32hex.h
 src/common/base64.c
 src/common/base64.h
-src/common/binsearch.h
-src/common/crc.h
 src/common/debug.h
-src/common/descriptor.c
-src/common/descriptor.h
-src/common/errcode.c
-src/common/errcode.h
-src/common/errors.c
-src/common/errors.h
-src/common/evsched.c
-src/common/evsched.h
-src/common/fdset.c
-src/common/fdset.h
 src/common/getline.c
 src/common/getline.h
-src/common/hattrie/hat-trie.c
-src/common/hattrie/hat-trie.h
-src/common/hattrie/murmurhash3.c
-src/common/hattrie/murmurhash3.h
-src/common/heap.c
-src/common/heap.h
-src/common/hex.c
-src/common/hex.h
-src/common/hhash.c
-src/common/hhash.h
-src/common/lists.c
-src/common/lists.h
-src/common/log.c
-src/common/log.h
 src/common/memdup.h
-src/common/mempattern.c
-src/common/mempattern.h
-src/common/mempool.c
-src/common/mempool.h
-src/common/print.c
-src/common/print.h
-src/common/ref.c
-src/common/ref.h
-src/common/slab/alloc-common.h
-src/common/slab/slab.c
-src/common/slab/slab.h
-src/common/sockaddr.c
-src/common/sockaddr.h
-src/common/strtonum.h
+src/common-knot/array-sort.h
+src/common-knot/binsearch.h
+src/common-knot/crc.h
+src/common-knot/errors.c
+src/common-knot/errors.h
+src/common-knot/evsched.c
+src/common-knot/evsched.h
+src/common-knot/fdset.c
+src/common-knot/fdset.h
+src/common-knot/hattrie/hat-trie.c
+src/common-knot/hattrie/hat-trie.h
+src/common-knot/hattrie/murmurhash3.c
+src/common-knot/hattrie/murmurhash3.h
+src/common-knot/heap.c
+src/common-knot/heap.h
+src/common-knot/hex.c
+src/common-knot/hex.h
+src/common-knot/hhash.c
+src/common-knot/hhash.h
+src/common-knot/lists.c
+src/common-knot/lists.h
+src/common-knot/log.c
+src/common-knot/log.h
+src/common-knot/mempool.c
+src/common-knot/mempool.h
+src/common-knot/print.c
+src/common-knot/print.h
+src/common-knot/ref.c
+src/common-knot/ref.h
+src/common-knot/slab/alloc-common.h
+src/common-knot/slab/slab.c
+src/common-knot/slab/slab.h
+src/common-knot/sockaddr.c
+src/common-knot/sockaddr.h
+src/common-knot/strtonum.h
 src/dnstap/Makefile.am
 src/dnstap/convert.c
 src/dnstap/convert.h
@@ -204,6 +198,8 @@ src/libknot/binary.h
 src/libknot/common.h
 src/libknot/consts.c
 src/libknot/consts.h
+src/libknot/descriptor.c
+src/libknot/descriptor.h
 src/libknot/dname.c
 src/libknot/dname.h
 src/libknot/dnssec/bitmap.h
@@ -221,7 +217,11 @@ src/libknot/dnssec/sig0.c
 src/libknot/dnssec/sig0.h
 src/libknot/dnssec/sign.c
 src/libknot/dnssec/sign.h
+src/libknot/errcode.c
+src/libknot/errcode.h
 src/libknot/libknot.h
+src/libknot/mempattern.c
+src/libknot/mempattern.h
 src/libknot/packet/compr.c
 src/libknot/packet/compr.h
 src/libknot/packet/pkt.c
@@ -257,18 +257,18 @@ src/libknot/util/tolower.c
 src/libknot/util/tolower.h
 src/libknot/util/utils.c
 src/libknot/util/utils.h
-src/utils/common/exec.c
-src/utils/common/exec.h
-src/utils/common/msg.c
-src/utils/common/msg.h
-src/utils/common/netio.c
-src/utils/common/netio.h
-src/utils/common/params.c
-src/utils/common/params.h
-src/utils/common/resolv.c
-src/utils/common/resolv.h
-src/utils/common/token.c
-src/utils/common/token.h
+src/utils/common-knot/exec.c
+src/utils/common-knot/exec.h
+src/utils/common-knot/msg.c
+src/utils/common-knot/msg.h
+src/utils/common-knot/netio.c
+src/utils/common-knot/netio.h
+src/utils/common-knot/params.c
+src/utils/common-knot/params.h
+src/utils/common-knot/resolv.c
+src/utils/common-knot/resolv.h
+src/utils/common-knot/token.c
+src/utils/common-knot/token.h
 src/utils/dig/dig_exec.c
 src/utils/dig/dig_exec.h
 src/utils/dig/dig_main.c
diff --git a/src/common/LICENSE.txt b/src/common-knot/LICENSE.txt
similarity index 100%
rename from src/common/LICENSE.txt
rename to src/common-knot/LICENSE.txt
diff --git a/src/common/array-sort.h b/src/common-knot/array-sort.h
similarity index 100%
rename from src/common/array-sort.h
rename to src/common-knot/array-sort.h
diff --git a/src/common/binsearch.h b/src/common-knot/binsearch.h
similarity index 100%
rename from src/common/binsearch.h
rename to src/common-knot/binsearch.h
diff --git a/src/common/crc.h b/src/common-knot/crc.h
similarity index 100%
rename from src/common/crc.h
rename to src/common-knot/crc.h
diff --git a/src/common/errors.c b/src/common-knot/errors.c
similarity index 98%
rename from src/common/errors.c
rename to src/common-knot/errors.c
index a2f3c7c7bda81fe2c307749929704017373fa29b..cbd0d7d5fc31aadc4a3702ec7adcd218aa7e98ae 100644
--- a/src/common/errors.c
+++ b/src/common-knot/errors.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include "common/errors.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 /*!
  * \brief Looks up the given id in the lookup table.
diff --git a/src/common/errors.h b/src/common-knot/errors.h
similarity index 100%
rename from src/common/errors.h
rename to src/common-knot/errors.h
diff --git a/src/common/evsched.c b/src/common-knot/evsched.c
similarity index 99%
rename from src/common/evsched.c
rename to src/common-knot/evsched.c
index 16143a7e5b32f8e630efbacf0979bdc4865bbec8..be6ba1d321932aa0c0ffc350442d65c48967eb12 100644
--- a/src/common/evsched.c
+++ b/src/common-knot/evsched.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/evsched.h"
 
 /*! \brief Some implementations of timercmp >= are broken, this is for compat.*/
diff --git a/src/common/evsched.h b/src/common-knot/evsched.h
similarity index 100%
rename from src/common/evsched.h
rename to src/common-knot/evsched.h
diff --git a/src/common/fdset.c b/src/common-knot/fdset.c
similarity index 100%
rename from src/common/fdset.c
rename to src/common-knot/fdset.c
diff --git a/src/common/fdset.h b/src/common-knot/fdset.h
similarity index 100%
rename from src/common/fdset.h
rename to src/common-knot/fdset.h
diff --git a/src/common/hattrie/COPYING b/src/common-knot/hattrie/COPYING
similarity index 100%
rename from src/common/hattrie/COPYING
rename to src/common-knot/hattrie/COPYING
diff --git a/src/common/hattrie/README.md b/src/common-knot/hattrie/README.md
similarity index 100%
rename from src/common/hattrie/README.md
rename to src/common-knot/hattrie/README.md
diff --git a/src/common/hattrie/hat-trie.c b/src/common-knot/hattrie/hat-trie.c
similarity index 100%
rename from src/common/hattrie/hat-trie.c
rename to src/common-knot/hattrie/hat-trie.c
diff --git a/src/common/hattrie/hat-trie.h b/src/common-knot/hattrie/hat-trie.h
similarity index 99%
rename from src/common/hattrie/hat-trie.h
rename to src/common-knot/hattrie/hat-trie.h
index c68ab67006ac7845b586a1fc3a805594a293c3d5..125e9862c9b0de6178e6a50e903efa42b58863ae 100644
--- a/src/common/hattrie/hat-trie.h
+++ b/src/common-knot/hattrie/hat-trie.h
@@ -25,7 +25,7 @@ extern "C" {
 #include <stdlib.h>
 #include <stdbool.h>
 #include "libknot/common.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/hhash.h"
 
 /* Hat-trie defines. */
diff --git a/src/common/hattrie/murmurhash3.c b/src/common-knot/hattrie/murmurhash3.c
similarity index 100%
rename from src/common/hattrie/murmurhash3.c
rename to src/common-knot/hattrie/murmurhash3.c
diff --git a/src/common/hattrie/murmurhash3.h b/src/common-knot/hattrie/murmurhash3.h
similarity index 100%
rename from src/common/hattrie/murmurhash3.h
rename to src/common-knot/hattrie/murmurhash3.h
diff --git a/src/common/heap.c b/src/common-knot/heap.c
similarity index 100%
rename from src/common/heap.c
rename to src/common-knot/heap.c
diff --git a/src/common/heap.h b/src/common-knot/heap.h
similarity index 100%
rename from src/common/heap.h
rename to src/common-knot/heap.h
diff --git a/src/common/hex.c b/src/common-knot/hex.c
similarity index 98%
rename from src/common/hex.c
rename to src/common-knot/hex.c
index 0fb8d7b1bb4f0f1c117fc5f101db242d03ef6ead..8f77e085b9037df321993eb9b5219e83bb7c0582 100644
--- a/src/common/hex.c
+++ b/src/common-knot/hex.c
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 /*!
  * \brief Convert HEX char to byte.
diff --git a/src/common/hex.h b/src/common-knot/hex.h
similarity index 100%
rename from src/common/hex.h
rename to src/common-knot/hex.h
diff --git a/src/common/hhash.c b/src/common-knot/hhash.c
similarity index 99%
rename from src/common/hhash.c
rename to src/common-knot/hhash.c
index 2a572be78769b8f9b2ff0cc7de1195a51d335979..0c6c99fa69acdd5a326ce92adcae6d2f36a00fd2 100644
--- a/src/common/hhash.c
+++ b/src/common-knot/hhash.c
@@ -4,7 +4,7 @@
 
 #include "common/hhash.h"
 #include "common/binsearch.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/hattrie/murmurhash3.h"
 #include "libknot/common.h"
 
diff --git a/src/common/hhash.h b/src/common-knot/hhash.h
similarity index 99%
rename from src/common/hhash.h
rename to src/common-knot/hhash.h
index 68c4b1bfc50ffd222267a9e14f6cf67e30e0db6e..abd63fd1014aa25568579acadf1a7c9d24bc1a33 100644
--- a/src/common/hhash.h
+++ b/src/common-knot/hhash.h
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 /*! \brief Bitvector type. */
 typedef unsigned hhbitvec_t;
diff --git a/src/common/lists.c b/src/common-knot/lists.c
similarity index 100%
rename from src/common/lists.c
rename to src/common-knot/lists.c
diff --git a/src/common/lists.h b/src/common-knot/lists.h
similarity index 99%
rename from src/common/lists.h
rename to src/common-knot/lists.h
index 10e591c1f0202eb419ddf7e2b8cd24c3dcc3a200..d9bfa035f1ef5a7273d74fc232bccfeeae8c4ad5 100644
--- a/src/common/lists.h
+++ b/src/common-knot/lists.h
@@ -84,7 +84,7 @@ void list_dup(list_t *dst, list_t *src, size_t itemsz);
 size_t list_size(const list_t *);
 
 #include <stdbool.h>
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 /*!
  * \brief Generic pointer list implementation.
  */
diff --git a/src/common/log.c b/src/common-knot/log.c
similarity index 100%
rename from src/common/log.c
rename to src/common-knot/log.c
diff --git a/src/common/log.h b/src/common-knot/log.h
similarity index 100%
rename from src/common/log.h
rename to src/common-knot/log.h
diff --git a/src/common/mempool.c b/src/common-knot/mempool.c
similarity index 99%
rename from src/common/mempool.c
rename to src/common-knot/mempool.c
index cda8e6e3df54cc48dd6b642febc8c1311b61b82d..b0e9c1ae39c58662c200d5f031365ba0d3effaeb 100644
--- a/src/common/mempool.c
+++ b/src/common-knot/mempool.c
@@ -12,7 +12,7 @@
 #undef LOCAL_DEBUG
 
 #include "common/mempool.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/common/mempool.h b/src/common-knot/mempool.h
similarity index 100%
rename from src/common/mempool.h
rename to src/common-knot/mempool.h
diff --git a/src/common/print.c b/src/common-knot/print.c
similarity index 100%
rename from src/common/print.c
rename to src/common-knot/print.c
diff --git a/src/common/print.h b/src/common-knot/print.h
similarity index 100%
rename from src/common/print.h
rename to src/common-knot/print.h
diff --git a/src/common/ref.c b/src/common-knot/ref.c
similarity index 100%
rename from src/common/ref.c
rename to src/common-knot/ref.c
diff --git a/src/common/ref.h b/src/common-knot/ref.h
similarity index 100%
rename from src/common/ref.h
rename to src/common-knot/ref.h
diff --git a/src/common/slab/alloc-common.h b/src/common-knot/slab/alloc-common.h
similarity index 100%
rename from src/common/slab/alloc-common.h
rename to src/common-knot/slab/alloc-common.h
diff --git a/src/common/slab/slab.c b/src/common-knot/slab/slab.c
similarity index 100%
rename from src/common/slab/slab.c
rename to src/common-knot/slab/slab.c
diff --git a/src/common/slab/slab.h b/src/common-knot/slab/slab.h
similarity index 100%
rename from src/common/slab/slab.h
rename to src/common-knot/slab/slab.h
diff --git a/src/common/sockaddr.c b/src/common-knot/sockaddr.c
similarity index 99%
rename from src/common/sockaddr.c
rename to src/common-knot/sockaddr.c
index eb9a133210689dbc37b42e387662603742948b9a..1d2766aa37e0a6ee077c3f96a652b73cff955432 100644
--- a/src/common/sockaddr.c
+++ b/src/common-knot/sockaddr.c
@@ -19,7 +19,7 @@
 #include <netdb.h>
 
 #include "common/sockaddr.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/consts.h"
 
 int sockaddr_len(const struct sockaddr_storage *ss)
diff --git a/src/common/sockaddr.h b/src/common-knot/sockaddr.h
similarity index 100%
rename from src/common/sockaddr.h
rename to src/common-knot/sockaddr.h
diff --git a/src/common/strtonum.h b/src/common-knot/strtonum.h
similarity index 99%
rename from src/common/strtonum.h
rename to src/common-knot/strtonum.h
index 926ce888bd415e4f020f17e7930439ae8a0b03b5..9d15b95f1641e606b77206ecb35385b0745a2385 100644
--- a/src/common/strtonum.h
+++ b/src/common-knot/strtonum.h
@@ -30,7 +30,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 typedef long long int knot_strtoll_result_t;
 typedef unsigned long long int knot_strtoull_result_t;
diff --git a/src/common/base32hex.c b/src/common/base32hex.c
index e563063ec1f8d3140b970851cb0f35a83de23453..dbea047f2792a103a0a3eda3bd503d580bda9528 100644
--- a/src/common/base32hex.c
+++ b/src/common/base32hex.c
@@ -15,7 +15,7 @@
  */
 
 #include "common/base32hex.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 #include <stdlib.h>			// malloc
 #include <stdint.h>			// uint8_t
diff --git a/src/common/base64.c b/src/common/base64.c
index d1e4b8ac0c89ea77836073a395eee675053c1464..7c57a78c9ee7b27abafaa51df6df09782250092e 100644
--- a/src/common/base64.c
+++ b/src/common/base64.c
@@ -15,7 +15,7 @@
  */
 
 #include "common/base64.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 #include <stdlib.h>			// malloc
 #include <stdint.h>			// uint8_t
diff --git a/src/dnstap/message.c b/src/dnstap/message.c
index bd3ff2daeb070c2e0dd2f16d84d93c5394ddc65d..7c4de6857c70dd5aba4360e5ff6586ccba8f48de 100644
--- a/src/dnstap/message.c
+++ b/src/dnstap/message.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>                     // memset
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 #include "dnstap/convert.h"
 #include "dnstap/message.h"
diff --git a/src/dnstap/reader.c b/src/dnstap/reader.c
index 769d56766c3a23d7466335f29d68ad464e05d5ad..c0ff4d60ed9e17b2e2e91619db7b26ab3b5bc52f 100644
--- a/src/dnstap/reader.c
+++ b/src/dnstap/reader.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>                     // calloc, free
 #include <string.h>                     // strdup
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/common.h"
 
 #include "dnstap/dnstap.h"
diff --git a/src/dnstap/writer.c b/src/dnstap/writer.c
index e296d062467ac1646c68b67ca175165f6f32c0fc..de5a7ff262a14ae60dd4917bd9647491bbb7f4b5 100644
--- a/src/dnstap/writer.c
+++ b/src/dnstap/writer.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>                     // calloc, free
 #include <string.h>                     // strdup
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/common.h"
 
 #include "dnstap/dnstap.h"
diff --git a/src/knot/ctl/knotc_main.c b/src/knot/ctl/knotc_main.c
index b6795ec4fc783c8627c9973a411b8094c72dcc43..0eebc153fa794415ca3d151a13da01a781f192dc 100644
--- a/src/knot/ctl/knotc_main.c
+++ b/src/knot/ctl/knotc_main.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "knot/knot.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "knot/ctl/process.h"
 #include "knot/ctl/remote.h"
 #include "knot/conf/conf.h"
diff --git a/src/knot/ctl/process.c b/src/knot/ctl/process.c
index 588f9ae1f91107dbb74e6b2b78099706f5984b8b..efe0c67a03a3813d10c1cbac8a1b048f269377d0 100644
--- a/src/knot/ctl/process.c
+++ b/src/knot/ctl/process.c
@@ -32,7 +32,7 @@
 #include "knot/knot.h"
 #include "knot/ctl/process.h"
 #include "knot/conf/conf.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 char* pid_filename()
 {
diff --git a/src/knot/ctl/remote.c b/src/knot/ctl/remote.c
index cbc143cf75d961fa707193007503f012fe726cc5..87833db505bab841361902fa5fc79c67c54421f4 100644
--- a/src/knot/ctl/remote.c
+++ b/src/knot/ctl/remote.c
@@ -23,7 +23,7 @@
 #include "knot/server/net.h"
 #include "knot/server/tcp-handler.h"
 #include "libknot/packet/wire.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/tsig-op.h"
 #include "libknot/rrtype/rdname.h"
 #include "libknot/rrtype/soa.h"
diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index 0e0fb1afed786e594f70e89051030fe858446c6b..c9622a550d55b15f760cc5f29fdea2245e572f03 100644
--- a/src/knot/dnssec/zone-keys.c
+++ b/src/knot/dnssec/zone-keys.c
@@ -20,8 +20,8 @@
 #include <inttypes.h>
 
 #include "common/debug.h"
-#include "common/errcode.h"
-#include "common/mempattern.h"
+#include "libknot/errcode.h"
+#include "libknot/mempattern.h"
 #include "libknot/common.h"
 #include "libknot/dname.h"
 #include "libknot/consts.h"
diff --git a/src/knot/dnssec/zone-nsec.c b/src/knot/dnssec/zone-nsec.c
index 1ab89f754870ab829e250ad8ebc86400f103f886..dc12c426d8b64c7ccf7c51766be33cb6bcf40b67 100644
--- a/src/knot/dnssec/zone-nsec.c
+++ b/src/knot/dnssec/zone-nsec.c
@@ -22,7 +22,7 @@
 
 #include "common/base32hex.h"
 #include "common/debug.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/hhash.h"
 #include "libknot/dnssec/bitmap.h"
 #include "libknot/util/utils.h"
diff --git a/src/knot/dnssec/zone-sign.c b/src/knot/dnssec/zone-sign.c
index 4d887c1f4eccac7fee21f59413ad54ecf8c2b53c..6af2c7510a9b5bcdf105f15b03e9215aaaa80e75 100644
--- a/src/knot/dnssec/zone-sign.c
+++ b/src/knot/dnssec/zone-sign.c
@@ -21,8 +21,8 @@
 #include <time.h>
 
 #include "common/debug.h"
-#include "common/descriptor.h"
-#include "common/errcode.h"
+#include "libknot/descriptor.h"
+#include "libknot/errcode.h"
 #include "common/hattrie/hat-trie.h"
 #include "libknot/common.h"
 #include "libknot/dname.h"
diff --git a/src/knot/knot.h b/src/knot/knot.h
index aeacd5fb297a0cdacfdf6c77563c235abdf0ad4e..24ab32fcbe339ef41b298c8987cf6376319761f4 100644
--- a/src/knot/knot.h
+++ b/src/knot/knot.h
@@ -32,7 +32,7 @@
 
 #include "common/print.h"
 #include "common/log.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "knot/other/debug.h"
 
 #define DEFAULT_THR_COUNT 2  /*!< \brief Default thread count. */
diff --git a/src/knot/modules/dnstap.c b/src/knot/modules/dnstap.c
index 9f2d65ba927a4bd40b07a37f7e9f5b2918c08780..7c2c822f4856e27528c57508b3e9d267cfb121b4 100644
--- a/src/knot/modules/dnstap.c
+++ b/src/knot/modules/dnstap.c
@@ -23,7 +23,7 @@
 #include "dnstap/writer.h"
 #include "dnstap/message.h"
 #include "dnstap/dnstap.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 /* Defines. */
 #define MODULE_ERR(msg...) log_zone_error("Module 'dnstap': " msg)
diff --git a/src/knot/modules/synth_record.c b/src/knot/modules/synth_record.c
index 53fc4382fe6d62da283a77c32bc5e4cf62dd11fa..40e5bd36f9895bf6ccb3f7944feeae60f437d195 100644
--- a/src/knot/modules/synth_record.c
+++ b/src/knot/modules/synth_record.c
@@ -18,7 +18,7 @@
 #include "knot/nameserver/query_module.h"
 #include "knot/nameserver/process_query.h"
 #include "knot/nameserver/internet.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 /* Defines. */
 #define ARPA_ZONE_LABELS 2
diff --git a/src/knot/nameserver/axfr.c b/src/knot/nameserver/axfr.c
index b30e44bdab707a4c3f7a5ed8ca3cb848794faf48..9cbdf7b1a51bbe16cadc9a569480d3d3eb62f524 100644
--- a/src/knot/nameserver/axfr.c
+++ b/src/knot/nameserver/axfr.c
@@ -21,7 +21,7 @@
 #include "knot/updates/apply.h"
 #include "knot/zone/zonefile.h"
 #include "common/debug.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/lists.h"
 
 /* AXFR context. @note aliasing the generic xfr_proc */
diff --git a/src/knot/nameserver/chaos.c b/src/knot/nameserver/chaos.c
index 85bdcdd4e22d79b244dd34d9e532a29db2b486aa..41822136355eede084f8557e4ed8e47cd2763114 100644
--- a/src/knot/nameserver/chaos.c
+++ b/src/knot/nameserver/chaos.c
@@ -18,7 +18,7 @@
 
 #include "knot/nameserver/chaos.h"
 #include "knot/conf/conf.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/packet/pkt.h"
 
 /*!
diff --git a/src/knot/nameserver/internet.c b/src/knot/nameserver/internet.c
index bb6c99caa4082f8deac3edc3d932fea15635b249..31277dc042111e8652cc1f8483bacf4633f844c7 100644
--- a/src/knot/nameserver/internet.c
+++ b/src/knot/nameserver/internet.c
@@ -15,7 +15,7 @@
  */
 
 #include "common/debug.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/common.h"
 #include "libknot/rrtype/rdname.h"
 #include "libknot/rrtype/soa.h"
diff --git a/src/knot/nameserver/ixfr.c b/src/knot/nameserver/ixfr.c
index cea0bcfe8897c72a4e471b73c0ec301ebedb242d..8d58f96d1074a63ae649802ea3f289c5f498ff47 100644
--- a/src/knot/nameserver/ixfr.c
+++ b/src/knot/nameserver/ixfr.c
@@ -5,7 +5,7 @@
 #include "knot/nameserver/process_answer.h"
 #include "knot/updates/apply.h"
 #include "common/debug.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/util/utils.h"
 #include "libknot/rrtype/soa.h"
 
diff --git a/src/knot/nameserver/notify.c b/src/knot/nameserver/notify.c
index 970bb8e88df3ae41214535fb2a7479c7b6e70dc1..b891b41cd291a5caab9f5be8af959d20c14a89c9 100644
--- a/src/knot/nameserver/notify.c
+++ b/src/knot/nameserver/notify.c
@@ -19,7 +19,7 @@
 #include "knot/nameserver/notify.h"
 
 #include "libknot/dname.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/packet/pkt.h"
 #include "libknot/rrset.h"
 #include "libknot/consts.h"
diff --git a/src/knot/nameserver/process_query.c b/src/knot/nameserver/process_query.c
index c3ccd94711f5f18e20fcfa7d7db666a5d4b69e4b..952e561ab1e3a899f83133980be829ca8fc70466 100644
--- a/src/knot/nameserver/process_query.c
+++ b/src/knot/nameserver/process_query.c
@@ -14,7 +14,7 @@
 #include "knot/updates/acl.h"
 #include "knot/conf/conf.h"
 #include "libknot/tsig-op.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/debug.h"
 
 /* Forward decls. */
diff --git a/src/knot/nameserver/query_module.c b/src/knot/nameserver/query_module.c
index 5e9d9fcb1181a85ddbce49a324ccfa22fd39bbd5..8c4f1bef21a715bbfdb5ba7d412e62f252025629 100644
--- a/src/knot/nameserver/query_module.c
+++ b/src/knot/nameserver/query_module.c
@@ -1,6 +1,6 @@
 #include "knot/nameserver/query_module.h"
-#include "common/mempattern.h"
-#include "common/errcode.h"
+#include "libknot/mempattern.h"
+#include "libknot/errcode.h"
 
 /* Compiled-in module headers. */
 #include "knot/modules/synth_record.h"
diff --git a/src/knot/nameserver/query_module.h b/src/knot/nameserver/query_module.h
index cb0678213c08cd4c3e08c28e059f54e1ec75066e..8cbeaee56ab7274371d4a04f901b374bf758731a 100644
--- a/src/knot/nameserver/query_module.h
+++ b/src/knot/nameserver/query_module.h
@@ -42,7 +42,7 @@
 #define _QUERY_MODULE_H
 
 #include "common/lists.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/consts.h"
 #include "libknot/packet/pkt.h"
 
diff --git a/src/knot/nameserver/tsig_ctx.c b/src/knot/nameserver/tsig_ctx.c
index e2c08d6e858af91f9584bd23820b9d0ceb36ef69..5e1bde81961fd99ffe68aa4d8b67136538e14139 100644
--- a/src/knot/nameserver/tsig_ctx.c
+++ b/src/knot/nameserver/tsig_ctx.c
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/rrtype/tsig.h"
 #include "libknot/tsig-op.h"
 #include "knot/nameserver/tsig_ctx.h"
diff --git a/src/knot/nameserver/update.c b/src/knot/nameserver/update.c
index bbaf320d7462f108ce92d00483922bf9e535507c..7b98ad406100d2e9bde8b46c3bb8dcc3e7388f86 100644
--- a/src/knot/nameserver/update.c
+++ b/src/knot/nameserver/update.c
@@ -6,7 +6,7 @@
 #include "common/debug.h"
 #include "knot/dnssec/zone-events.h"
 #include "knot/updates/ddns.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/tsig-op.h"
 #include "knot/zone/zone.h"
 #include "knot/zone/events.h"
diff --git a/src/knot/server/rrl.c b/src/knot/server/rrl.c
index bf93246d7b4193b70b9486b368e5c492b26e3c4c..56862fc6edea5ee0ff4735b500493767a5cd28d5 100644
--- a/src/knot/server/rrl.c
+++ b/src/knot/server/rrl.c
@@ -26,7 +26,7 @@
 #include "libknot/packet/wire.h"
 #include "common/hattrie/murmurhash3.h"
 #include "libknot/dnssec/random.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/errors.h"
 #include "knot/zone/zone.h"
 
diff --git a/src/knot/server/serialization.c b/src/knot/server/serialization.c
index 8d708f87aac5b17b23dd420823abb133f85030a2..c917837584069577cc5c0ef033d4694e30a60635 100644
--- a/src/knot/server/serialization.c
+++ b/src/knot/server/serialization.c
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 #include "knot/server/serialization.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 static size_t rr_binary_size(const knot_rrset_t *rrset, size_t rdata_pos)
 {
diff --git a/src/knot/server/udp-handler.c b/src/knot/server/udp-handler.c
index 12dbf9269b8dd6c633c4bd0f164437b0f5c9fcb7..34681c8845f7cc46f7cbbd0403fcdb3e8a8b5f59 100644
--- a/src/knot/server/udp-handler.c
+++ b/src/knot/server/udp-handler.c
@@ -37,7 +37,7 @@
 #endif /* HAVE_CAP_NG_H */
 
 #include "common/sockaddr.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/mempool.h"
 #include "knot/knot.h"
 #include "knot/server/udp-handler.h"
diff --git a/src/knot/server/zone-load.c b/src/knot/server/zone-load.c
index 97972221d83616f97729ba05a2300fd6282db5b4..70dc91018c41267da7f1ee05c02fcf5ddec05db2 100644
--- a/src/knot/server/zone-load.c
+++ b/src/knot/server/zone-load.c
@@ -29,7 +29,7 @@
 #include "knot/zone/zone.h"
 #include "knot/zone/zone.h"
 #include "knot/zone/zonedb.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 /* Constants */
 
diff --git a/src/knot/updates/acl.c b/src/knot/updates/acl.c
index f0778488652ec761a1c3e836533e882229fbb6ce..b9bbc30060c3ac229861493237068c64f3d84dd4 100644
--- a/src/knot/updates/acl.c
+++ b/src/knot/updates/acl.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <stdbool.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "knot/updates/acl.h"
 #include "libknot/util/endian.h"
 #include "libknot/rrtype/tsig.h"
diff --git a/src/knot/updates/acl.h b/src/knot/updates/acl.h
index e73a01f72a26f717e16d3308b9e9bcfdc779d7f1..4d76847ddcae8669899b0b1e2b86e79828897c4b 100644
--- a/src/knot/updates/acl.h
+++ b/src/knot/updates/acl.h
@@ -32,7 +32,7 @@
 
 #include "common/lists.h"
 #include "common/sockaddr.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/rrtype/tsig.h"
 
 struct knot_tsig_key;
diff --git a/src/knot/updates/apply.c b/src/knot/updates/apply.c
index ac3c9c2dcc728a21db974fbf9b6d746855a6d85a..8bb8ccb0f6ff9731fff99699b94ccd0fde6e185d 100644
--- a/src/knot/updates/apply.c
+++ b/src/knot/updates/apply.c
@@ -27,7 +27,7 @@
 #include "knot/updates/changesets.h"
 #include "knot/zone/zonefile.h"
 #include "common/lists.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/util/utils.h"
 #include "libknot/rrtype/soa.h"
 
diff --git a/src/knot/updates/changesets.c b/src/knot/updates/changesets.c
index bc9250690a07d95bdfc3a47c51adf3887c908648..b84cd40600f73558df4018f77a91a88c19df504a 100644
--- a/src/knot/updates/changesets.c
+++ b/src/knot/updates/changesets.c
@@ -20,8 +20,8 @@
 
 #include "knot/updates/changesets.h"
 #include "libknot/common.h"
-#include "common/descriptor.h"
-#include "common/mempattern.h"
+#include "libknot/descriptor.h"
+#include "libknot/mempattern.h"
 #include "common/mempool.h"
 #include "libknot/rrset.h"
 #include "libknot/rrtype/soa.h"
diff --git a/src/knot/updates/changesets.h b/src/knot/updates/changesets.h
index 0cc872db0f410beeb103a2bffd6766902154dbab..4ecddf27beea90fa37cdc0421395c072579fafff 100644
--- a/src/knot/updates/changesets.h
+++ b/src/knot/updates/changesets.h
@@ -30,7 +30,7 @@
 #include "libknot/rrset.h"
 #include "knot/zone/node.h"
 #include "common/lists.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/knot/updates/ddns.c b/src/knot/updates/ddns.c
index ed019c46cc553b6a9fa1b1fc92c09d40588771e9..5cc3d3ab5509746d56df4f678fd8c8af7a7b8168 100644
--- a/src/knot/updates/ddns.c
+++ b/src/knot/updates/ddns.c
@@ -27,8 +27,8 @@
 #include "libknot/common.h"
 #include "libknot/consts.h"
 #include "libknot/rrtype/soa.h"
-#include "common/mempattern.h"
-#include "common/descriptor.h"
+#include "libknot/mempattern.h"
+#include "libknot/descriptor.h"
 #include "common/lists.h"
 
 /* ----------------------------- prereq check ------------------------------- */
diff --git a/src/knot/worker/pool.c b/src/knot/worker/pool.c
index 42ff57217fe6875525511f4447bd3291fa09da31..6ae26e9a7944a3abfbed5bbc4d7221b9eb112aaf 100644
--- a/src/knot/worker/pool.c
+++ b/src/knot/worker/pool.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "knot/server/dthreads.h"
 #include "knot/worker/pool.h"
 #include "knot/worker/queue.h"
diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index f7b504a006fdd753ac4dbb58c94b7f54e4f19b79..be01a060c8f5e52c148b5bc397756daf8db5064b 100644
--- a/src/knot/zone/contents.c
+++ b/src/knot/zone/contents.c
@@ -20,7 +20,7 @@
 #include "common/debug.h"
 #include "libknot/rrset.h"
 #include "common/base32hex.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/hattrie/hat-trie.h"
 #include "knot/dnssec/zone-nsec.h"
 #include "knot/dnssec/zone-sign.h"
diff --git a/src/knot/zone/estimator.c b/src/knot/zone/estimator.c
index e9c1d33567b03b7b4f0f0e15ee8dae69c58773f1..f947576ebd3a29a06faa2802fa5e7d4990fbe5aa 100644
--- a/src/knot/zone/estimator.c
+++ b/src/knot/zone/estimator.c
@@ -21,7 +21,7 @@
 #include "common/lists.h"
 #include "knot/zone/node.h"
 #include "zscanner/zscanner.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 // Addition constants used for tweaking, mostly malloc overhead
 enum estim_consts {
diff --git a/src/knot/zone/node.c b/src/knot/zone/node.c
index b198f36778857600ba19f480ac53540b114b1b01..33daa4eee7110e28ec58f7e93693f507bc8e9fff 100644
--- a/src/knot/zone/node.c
+++ b/src/knot/zone/node.c
@@ -22,8 +22,8 @@
 #include "libknot/rrset.h"
 #include "libknot/rdataset.h"
 #include "libknot/rrtype/rrsig.h"
-#include "common/descriptor.h"
-#include "common/mempattern.h"
+#include "libknot/descriptor.h"
+#include "libknot/mempattern.h"
 
 /*! \brief Clears allocated data in RRSet entry. */
 static void rr_data_clear(struct rr_data *data, mm_ctx_t *mm)
diff --git a/src/knot/zone/node.h b/src/knot/zone/node.h
index e49f88048935e4a6f6ad59bf6aee1a945f670b95..bca15bc33e6da6e4530f89c902ce1002f46e7f17 100644
--- a/src/knot/zone/node.h
+++ b/src/knot/zone/node.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/dname.h"
 #include "libknot/rrset.h"
 #include "libknot/rdataset.h"
diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index 62546b92d1424475c78b2b6b0713a77d415937b4..0bb8a18fe3056d136cfe834981cc0e6940c2f0c2 100644
--- a/src/knot/zone/semantic-check.c
+++ b/src/knot/zone/semantic-check.c
@@ -32,8 +32,8 @@
 #include "libknot/rrtype/nsec3.h"
 #include "common/base32hex.h"
 #include "common/crc.h"
-#include "common/descriptor.h"
-#include "common/mempattern.h"
+#include "libknot/descriptor.h"
+#include "libknot/mempattern.h"
 #include "knot/dnssec/zone-nsec.h"
 
 #include "knot/zone/semantic-check.h"
diff --git a/src/knot/zone/zone-diff.c b/src/knot/zone/zone-diff.c
index 3f47099bc9dba332f83c2082952027bd1f995f36..c38f20b8b653b552e149cf186daebd330cd3426b 100644
--- a/src/knot/zone/zone-diff.c
+++ b/src/knot/zone/zone-diff.c
@@ -19,9 +19,9 @@
 #include <inttypes.h>
 
 #include "common/debug.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "knot/zone/zone-diff.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/util/utils.h"
 #include "libknot/rrtype/soa.h"
 
diff --git a/src/knot/zone/zone-dump.c b/src/knot/zone/zone-dump.c
index 77e2a44601e92201f58e43002d7c8262aa6c1bd7..1c8a29f7eb6d59c9cecbc343f4b2281786e7708e 100644
--- a/src/knot/zone/zone-dump.c
+++ b/src/knot/zone/zone-dump.c
@@ -17,7 +17,7 @@
 #include <inttypes.h>
 
 #include "knot/zone/zone-dump.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "knot/conf/conf.h"
 #include "libknot/libknot.h"
 #include "knot/dnssec/zone-nsec.h"
diff --git a/src/knot/zone/zone.c b/src/knot/zone/zone.c
index f538a71a1a170c959b6734c9cd95d6a76e6ccfed..9f72409ba3760ae240c9c1e5dcc62f9a87c8bc84 100644
--- a/src/knot/zone/zone.c
+++ b/src/knot/zone/zone.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/evsched.h"
 #include "common/lists.h"
 #include "knot/zone/node.h"
diff --git a/src/knot/zone/zonedb.c b/src/knot/zone/zonedb.c
index f6da9c9960b8b55d636196ad40e11fdd87bb3f16..ebe1659dd333e2752eca14c93b00c1661b06a5e7 100644
--- a/src/knot/zone/zonedb.c
+++ b/src/knot/zone/zonedb.c
@@ -28,7 +28,7 @@
 #include "libknot/packet/wire.h"
 #include "knot/zone/node.h"
 #include "common/debug.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/mempool.h"
 
 
diff --git a/src/libknot/binary.c b/src/libknot/binary.c
index 9582c02b2ac0ee037b91a90f90881c5c03331b93..6af20cacd9487bbd1a761379d319fc2337b7b19a 100644
--- a/src/libknot/binary.c
+++ b/src/libknot/binary.c
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include "common/base64.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/memdup.h"
 #include "libknot/binary.h"
 
diff --git a/src/libknot/common.h b/src/libknot/common.h
index 7a28ef0e3d012db814146ab03b1e34be29d0f105..827144bd2f623479d6d07dc946baf9e600ef822f 100644
--- a/src/libknot/common.h
+++ b/src/libknot/common.h
@@ -24,7 +24,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 #ifndef _KNOT_COMMON_H_
 #define _KNOT_COMMON_H_
diff --git a/src/common/descriptor.c b/src/libknot/descriptor.c
similarity index 100%
rename from src/common/descriptor.c
rename to src/libknot/descriptor.c
diff --git a/src/common/descriptor.h b/src/libknot/descriptor.h
similarity index 100%
rename from src/common/descriptor.h
rename to src/libknot/descriptor.h
diff --git a/src/libknot/dname.c b/src/libknot/dname.c
index 8688501d01f2624591d99e355e998ff9384b2be2..55b00204c3f4adc6dee0d3105871f13eb47e70bc 100644
--- a/src/libknot/dname.c
+++ b/src/libknot/dname.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "libknot/common.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/dname.h"
 #include "libknot/consts.h"
 #include "libknot/util/tolower.h"
diff --git a/src/libknot/dname.h b/src/libknot/dname.h
index cc5af05c320047a96b18319a88873bf2c566ff7a..e04d6b95823f987bfd8308e3eba4f4b4c94a8e67 100644
--- a/src/libknot/dname.h
+++ b/src/libknot/dname.h
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/consts.h"
 
 typedef uint8_t knot_dname_t;
diff --git a/src/libknot/dnssec/key.c b/src/libknot/dnssec/key.c
index 2b613374ea8d3f463662ed321b2b99f7ca9b4fac..bb0db1eddf564139929037f88d6a45e31ebc1566 100644
--- a/src/libknot/dnssec/key.c
+++ b/src/libknot/dnssec/key.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/getline.h"
 #include "libknot/binary.h"
 #include "libknot/common.h"
diff --git a/src/libknot/dnssec/random.h b/src/libknot/dnssec/random.h
index 29555033601261da7d3d6a9bdbe1ef5611dcc0c4..344ec843eb7bc2aa9d131d5583e264cfdf4d395e 100644
--- a/src/libknot/dnssec/random.h
+++ b/src/libknot/dnssec/random.h
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <openssl/rand.h>
 #include <stdint.h>
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 /*!
  * \brief Fill a buffer with random data.
diff --git a/src/libknot/dnssec/rrset-sign.c b/src/libknot/dnssec/rrset-sign.c
index 482bb1fa0c1f426a62aa2386af4c88d16e83209c..65c0b53d3c3f9af8a675e93e923468fd92a6d365 100644
--- a/src/libknot/dnssec/rrset-sign.c
+++ b/src/libknot/dnssec/rrset-sign.c
@@ -18,8 +18,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "common/errcode.h"
-#include "common/descriptor.h"
+#include "libknot/errcode.h"
+#include "libknot/descriptor.h"
 #include "libknot/common.h"
 #include "libknot/dnssec/key.h"
 #include "libknot/dnssec/policy.h"
diff --git a/src/libknot/dnssec/sig0.c b/src/libknot/dnssec/sig0.c
index 9040352b6ce8be0b3ac611dfb3d8f9c7a80cb9f5..fe6c516a901ff2f08b4b93704a7dadc790d167df 100644
--- a/src/libknot/dnssec/sig0.c
+++ b/src/libknot/dnssec/sig0.c
@@ -16,8 +16,8 @@
 
 #include <assert.h>
 #include <time.h>
-#include "common/errcode.h"
-#include "common/descriptor.h"
+#include "libknot/errcode.h"
+#include "libknot/descriptor.h"
 #include "libknot/dnssec/rrset-sign.h"
 #include "libknot/dnssec/sig0.h"
 #include "libknot/dnssec/sign.h"
diff --git a/src/libknot/dnssec/sign.c b/src/libknot/dnssec/sign.c
index bd4f06689b9ddaa8aad96d84248f3567d445d3b3..ccf978d30ea2f78987351ac4e4f96ecdc37a8d2b 100644
--- a/src/libknot/dnssec/sign.c
+++ b/src/libknot/dnssec/sign.c
@@ -20,8 +20,8 @@
 #include <openssl/opensslconf.h>
 #include <openssl/rsa.h>
 #include <pthread.h>
-#include "common/descriptor.h"
-#include "common/errcode.h"
+#include "libknot/descriptor.h"
+#include "libknot/errcode.h"
 #include "libknot/common.h"
 #include "libknot/consts.h"
 #include "libknot/dnssec/config.h"
diff --git a/src/common/errcode.c b/src/libknot/errcode.c
similarity index 99%
rename from src/common/errcode.c
rename to src/libknot/errcode.c
index b9a5a38fc1ab0268387f20a2846ee78354b7f1dc..e6d6c5ad0b2cde520c1b8e26055082b0e542c6e1 100644
--- a/src/common/errcode.c
+++ b/src/libknot/errcode.c
@@ -14,7 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/errors.h"
 
 const error_table_t knot_error_msgs[] = {
diff --git a/src/common/errcode.h b/src/libknot/errcode.h
similarity index 100%
rename from src/common/errcode.h
rename to src/libknot/errcode.h
diff --git a/src/common/mempattern.c b/src/libknot/mempattern.c
similarity index 99%
rename from src/common/mempattern.c
rename to src/libknot/mempattern.c
index e89ebc2097d1dcbca72c360298dbf022c5297761..90e47d2f5fc25f489cd2dcc089d21642337fd89e 100644
--- a/src/common/mempattern.c
+++ b/src/libknot/mempattern.c
@@ -23,7 +23,7 @@
  #include <malloc.h>
 #endif /* HAVE_MALLOC_TRIM */
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/log.h"
 #include "common/slab/alloc-common.h"
 #include "common/mempool.h"
diff --git a/src/common/mempattern.h b/src/libknot/mempattern.h
similarity index 100%
rename from src/common/mempattern.h
rename to src/libknot/mempattern.h
diff --git a/src/libknot/packet/compr.c b/src/libknot/packet/compr.c
index f0421ca56777a0b9db0c09d00f43b1c5ddbbf0b6..820c6c86075125299beec558302cf25d79dee342 100644
--- a/src/libknot/packet/compr.c
+++ b/src/libknot/packet/compr.c
@@ -15,7 +15,7 @@
  */
 
 #include <assert.h>
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/packet/compr.h"
 #include "libknot/packet/pkt.h"
 #include "common/debug.h"
diff --git a/src/libknot/packet/pkt.c b/src/libknot/packet/pkt.c
index 81f3eacc2b6ae2f0e057ee5edb0be92ea96f2083..641b2132c22025477b313e6a7a744b3a8acd7852 100644
--- a/src/libknot/packet/pkt.c
+++ b/src/libknot/packet/pkt.c
@@ -21,7 +21,7 @@
 #include "libknot/packet/pkt.h"
 #include "common/debug.h"
 #include "libknot/common.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/packet/wire.h"
 #include "libknot/rrtype/tsig.h"
 #include "libknot/tsig-op.h"
diff --git a/src/libknot/packet/pkt.h b/src/libknot/packet/pkt.h
index f825b033411b47b62a7ccfc36a04a85df71adc1f..163d97b2a2d5e5c5d10d19a5880cd0cf085a8ba9 100644
--- a/src/libknot/packet/pkt.h
+++ b/src/libknot/packet/pkt.h
@@ -35,7 +35,7 @@
 #include "libknot/rrtype/opt.h"
 #include "libknot/packet/wire.h"
 #include "libknot/packet/compr.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 /* Number of packet sections (ANSWER, AUTHORITY, ADDITIONAL). */
 #define KNOT_PKT_SECTIONS 3
diff --git a/src/libknot/processing/process.h b/src/libknot/processing/process.h
index d748e55512df3f15fba4e5ec1eb0709da593fb9b..215bbacc8c28ebddc21af25db4f091e0903f0473 100644
--- a/src/libknot/processing/process.h
+++ b/src/libknot/processing/process.h
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/consts.h"
 #include "libknot/rrtype/tsig.h"
 #include "libknot/packet/pkt.h"
diff --git a/src/libknot/rdata.c b/src/libknot/rdata.c
index 4a2d606bc7cbbd1c6282223f340338cab02fa567..9d308da0d9331c8d636206203a192358169cf16d 100644
--- a/src/libknot/rdata.c
+++ b/src/libknot/rdata.c
@@ -21,7 +21,7 @@
 
 #include "libknot/rdata.h"
 #include "libknot/common.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 #ifndef STRICT_ALIGNMENT
 #pragma pack(push, 1)
diff --git a/src/libknot/rdata.h b/src/libknot/rdata.h
index bb8f54cc8164599d28679a8420efda3783c4da5e..a6ea8ce6030bb7b5399edee86707ab936c22e939 100644
--- a/src/libknot/rdata.h
+++ b/src/libknot/rdata.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 /* ---------------------------- Single RR ----------------------------------- */
 
diff --git a/src/libknot/rdataset.h b/src/libknot/rdataset.h
index 7f2ec479f2703cd39b1c757030d6a9574bcbfe65..f58cb583ea91ac38e1f2f484c136ea7a4b4cebec 100644
--- a/src/libknot/rdataset.h
+++ b/src/libknot/rdataset.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/rdata.h"
 
 /*!< \brief Set of RRs. */
diff --git a/src/libknot/rrset-dump.c b/src/libknot/rrset-dump.c
index 64825fbb129f8606b8f452265dcde68b7f69fdbb..e7961c8334f5aba25370b3249d1e3bf624def96c 100644
--- a/src/libknot/rrset-dump.c
+++ b/src/libknot/rrset-dump.c
@@ -28,10 +28,10 @@
 #include <netinet/in.h>			// in_addr (BSD)
 #include <arpa/inet.h>			// ntohs
 
-#include "common/errcode.h"		// KNOT_EOK
+#include "libknot/errcode.h"		// KNOT_EOK
 #include "common/base64.h"		// base64
 #include "common/base32hex.h"		// base32hex
-#include "common/descriptor.h"		// KNOT_RRTYPE
+#include "libknot/descriptor.h"		// KNOT_RRTYPE
 #include "libknot/dnssec/key.h"		// knot_keytag
 #include "libknot/consts.h"		// knot_rcode_names
 #include "libknot/util/utils.h"		// knot_wire_read_u16
diff --git a/src/libknot/rrset.c b/src/libknot/rrset.c
index 9f270830b287b91912f4b771120278cc575e2b1c..e9151626f071d1990563bd152a2857f0b9d36d34 100644
--- a/src/libknot/rrset.c
+++ b/src/libknot/rrset.c
@@ -23,10 +23,10 @@
 
 #include "libknot/consts.h"
 #include "libknot/common.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "libknot/rrset.h"
 #include "libknot/rrset-dump.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/debug.h"
 #include "libknot/util/utils.h"
 #include "libknot/packet/wire.h"
diff --git a/src/libknot/rrset.h b/src/libknot/rrset.h
index 46e6712ad11db2a44735ef6ac288252ff47f2f24..c92aa6849b9eff8af6959e5ccc09126788340320 100644
--- a/src/libknot/rrset.h
+++ b/src/libknot/rrset.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 #include "libknot/dname.h"
 #include "libknot/rdataset.h"
diff --git a/src/libknot/rrtype/nsec3.c b/src/libknot/rrtype/nsec3.c
index aeccf3a090dabbeef1c0427c6170f1c7672d7ddc..b6eae3fb22140ffefd79050fc4020ccf37212c02 100644
--- a/src/libknot/rrtype/nsec3.c
+++ b/src/libknot/rrtype/nsec3.c
@@ -20,7 +20,7 @@
 
 #include "libknot/rrtype/nsec3.h"
 #include "libknot/util/tolower.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 /*!
  * \brief Compute NSEC3 SHA1 hash.
diff --git a/src/libknot/rrtype/nsec3param.c b/src/libknot/rrtype/nsec3param.c
index e9c779f1252cc7a2ec06ca5b0ffdd919df562aef..1418b73849518c5bb151aadc950fae98d8b41dfa 100644
--- a/src/libknot/rrtype/nsec3param.c
+++ b/src/libknot/rrtype/nsec3param.c
@@ -15,7 +15,7 @@
  */
 
 #include "common/memdup.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/rrtype/nsec3param.h"
 
 /*!
diff --git a/src/libknot/rrtype/opt.c b/src/libknot/rrtype/opt.c
index 9f029b5fdfde8b7e57484157c4f716accd3e17ea..ff4833d74d6f9b909d54f1a5935f138b27444ccc 100644
--- a/src/libknot/rrtype/opt.c
+++ b/src/libknot/rrtype/opt.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "libknot/rrtype/opt.h"
 #include "libknot/common.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "common/debug.h"
 
 /*! \brief Some implementation-related constants. */
diff --git a/src/libknot/rrtype/rdname.h b/src/libknot/rrtype/rdname.h
index 9ede792369c7dce973bfc4453a205cce757a5a27..3a4e827612030dd1fdc6095fa854d8ea6d33a88e 100644
--- a/src/libknot/rrtype/rdname.h
+++ b/src/libknot/rrtype/rdname.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/rdataset.h"
 #include "libknot/dname.h"
 
diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c
index eecb7fc9bbc42e70074ee73f4274c3195566a9df..c308a81f2ccd0d9c74e7b984b9787b5dbecc998a 100644
--- a/src/libknot/tsig-op.c
+++ b/src/libknot/tsig-op.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "libknot/common.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/rrtype/tsig.h"
 #include "libknot/tsig-op.h"
 #include "libknot/packet/wire.h"
diff --git a/src/utils/dig/dig_exec.c b/src/utils/dig/dig_exec.c
index 47e889e03a90f7841b666adb18b84eb648888034..889c3d32e82f0ebeff39ca9cfa21fdee4a6edede 100644
--- a/src/utils/dig/dig_exec.c
+++ b/src/utils/dig/dig_exec.c
@@ -24,8 +24,8 @@
 #include "libknot/libknot.h"
 #include "common/lists.h"		// list
 #include "common/print.h"		// time_diff
-#include "common/errcode.h"		// KNOT_EOK
-#include "common/descriptor.h"		// KNOT_RRTYPE_
+#include "libknot/errcode.h"		// KNOT_EOK
+#include "libknot/descriptor.h"		// KNOT_RRTYPE_
 #include "common/sockaddr.h"		// sockaddr_set_raw
 #include "utils/common/msg.h"		// WARN
 #include "utils/common/netio.h"		// get_socktype
diff --git a/src/utils/dig/dig_main.c b/src/utils/dig/dig_main.c
index a8e6ccdfaaad8b39acea73c4cd86d9b7428fce10..d66c693a6594257253cc6355bd305761dd97e713 100644
--- a/src/utils/dig/dig_main.c
+++ b/src/utils/dig/dig_main.c
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>			// EXIT_FAILURE
 
-#include "common/errcode.h"		// KNOT_EOK
+#include "libknot/errcode.h"		// KNOT_EOK
 #include "utils/dig/dig_params.h"	// dig_parse
 #include "utils/dig/dig_exec.h"		// dig_exec
 
diff --git a/src/utils/dig/dig_params.c b/src/utils/dig/dig_params.c
index 34b2c8afc5401687cb7b7ea926f4d38d2af256ce..bb85b9547d8ca6c0388f9d9333f17418ea36e323 100644
--- a/src/utils/dig/dig_params.c
+++ b/src/utils/dig/dig_params.c
@@ -23,8 +23,8 @@
 #include <locale.h>			// setlocale
 
 #include "common/lists.h"		// list
-#include "common/errcode.h"		// KNOT_EOK
-#include "common/descriptor.h"		// KNOT_CLASS_IN
+#include "libknot/errcode.h"		// KNOT_EOK
+#include "libknot/descriptor.h"		// KNOT_CLASS_IN
 #include "utils/common/msg.h"		// WARN
 #include "utils/common/params.h"	// parse_class
 #include "utils/common/resolv.h"	// get_nameservers
diff --git a/src/utils/host/host_main.c b/src/utils/host/host_main.c
index 3331a61ee1d1be4761253df2165b352db75072c7..3aee58ef196810b04b951e886130647a1f809dfe 100644
--- a/src/utils/host/host_main.c
+++ b/src/utils/host/host_main.c
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>			// EXIT_FAILURE
 
-#include "common/errcode.h"		// KNOT_EOK
+#include "libknot/errcode.h"		// KNOT_EOK
 #include "utils/host/host_params.h"	// host_parse
 #include "utils/dig/dig_exec.h"		// dig_exec
 
diff --git a/src/utils/host/host_params.c b/src/utils/host/host_params.c
index f2193e0b02be13b4de3e8f028821ff29b26ed1c4..97fa6da3bf165a863edd0f1606b08b4bf93dcfa4 100644
--- a/src/utils/host/host_params.c
+++ b/src/utils/host/host_params.c
@@ -23,8 +23,8 @@
 #include <locale.h>			// setlocale
 
 #include "common/lists.h"		// list
-#include "common/errcode.h"		// KNOT_EOK
-#include "common/descriptor.h"		// KNOT_CLASS_IN
+#include "libknot/errcode.h"		// KNOT_EOK
+#include "libknot/descriptor.h"		// KNOT_CLASS_IN
 #include "utils/common/msg.h"		// WARN
 #include "utils/common/params.h"	// name_to_idn
 #include "utils/dig/dig_params.h"	// dig_params_t
diff --git a/src/utils/nsec3hash/nsec3hash_main.c b/src/utils/nsec3hash/nsec3hash_main.c
index eaff2315b0bf75fc136e0f8b77618df9344ef7b6..a7292db3911283bbde7765fcd58b2926cc5fcf27 100644
--- a/src/utils/nsec3hash/nsec3hash_main.c
+++ b/src/utils/nsec3hash/nsec3hash_main.c
@@ -23,7 +23,7 @@
 
 #include "utils/common/params.h"
 #include "common/base32hex.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/hex.h"
 #include "common/strtonum.h"
 #include "libknot/dnssec/crypto.h"
diff --git a/src/utils/nsupdate/nsupdate_exec.c b/src/utils/nsupdate/nsupdate_exec.c
index f58f99a5743026dc376cab7f1322622db2aa02f2..40eee6b60e73899cbfbb47b4619926e772f7870b 100644
--- a/src/utils/nsupdate/nsupdate_exec.c
+++ b/src/utils/nsupdate/nsupdate_exec.c
@@ -28,9 +28,9 @@
 #include "utils/common/exec.h"
 #include "utils/common/netio.h"
 #include "utils/common/token.h"
-#include "common/errcode.h"
-#include "common/mempattern.h"
-#include "common/descriptor.h"
+#include "libknot/errcode.h"
+#include "libknot/mempattern.h"
+#include "libknot/descriptor.h"
 #include "libknot/common.h"
 #include "libknot/libknot.h"
 #include "libknot/dnssec/random.h"
diff --git a/src/utils/nsupdate/nsupdate_main.c b/src/utils/nsupdate/nsupdate_main.c
index 3ab81b48095d4a661823d12803d10718d165042e..87984f26c8a9c3badf8448a7e7a2524135b83d2c 100644
--- a/src/utils/nsupdate/nsupdate_main.c
+++ b/src/utils/nsupdate/nsupdate_main.c
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>				// EXIT_FAILURE
 
-#include "common/errcode.h"			// KNOT_EOK
+#include "libknot/errcode.h"			// KNOT_EOK
 #include "utils/nsupdate/nsupdate_params.h"	// params_t
 #include "utils/nsupdate/nsupdate_exec.h"	// host_exec
 #include "libknot/dnssec/crypto.h"		// knot_crypto_cleanup
diff --git a/src/utils/nsupdate/nsupdate_params.c b/src/utils/nsupdate/nsupdate_params.c
index bb141af699727aae201289e28e5587b119f68f60..178d794f2d506414949f9fca01424b65c147492c 100644
--- a/src/utils/nsupdate/nsupdate_params.c
+++ b/src/utils/nsupdate/nsupdate_params.c
@@ -23,9 +23,9 @@
 #include "utils/nsupdate/nsupdate_params.h"
 #include "utils/common/msg.h"
 #include "utils/common/netio.h"
-#include "common/errcode.h"
-#include "common/descriptor.h"
-#include "common/mempattern.h"
+#include "libknot/errcode.h"
+#include "libknot/descriptor.h"
+#include "libknot/mempattern.h"
 #include "common/mempool.h"
 #include "libknot/libknot.h"
 
diff --git a/src/zscanner/scanner.rl b/src/zscanner/scanner.rl
index 756e1e774679270d857594d9ba46bb6091ddfdb4..20f0a0de64cf40929f78f81943b4b3daf87654bf 100644
--- a/src/zscanner/scanner.rl
+++ b/src/zscanner/scanner.rl
@@ -31,7 +31,7 @@
 #include "zscanner/loader.h"		// loader in includes
 #include "zscanner/error.h"
 #include "zscanner/functions.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 /*! \brief Shorthand for setting warning data. */
 #define WARN(code) { s->error_code = code; }
diff --git a/tests/acl.c b/tests/acl.c
index 6a7d497283d00c78f2bbaa7546b78423c7590197..36033b93604bcbfb3d26e49c7dc5463a973acbdb 100644
--- a/tests/acl.c
+++ b/tests/acl.c
@@ -19,7 +19,7 @@
 #include <sys/socket.h>
 #include <tap/basic.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/sockaddr.h"
 #include "knot/updates/acl.h"
 
diff --git a/tests/base32hex.c b/tests/base32hex.c
index 7012db7ca89fc78adef80fa0c8f8458f6681dc50..aac3c3a1d0fdd37c0cc6bcd39830818ac981e638 100644
--- a/tests/base32hex.c
+++ b/tests/base32hex.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/base32hex.h"
 
 #define BUF_LEN			256
diff --git a/tests/base64.c b/tests/base64.c
index d92ec399cfd49869697e4795bd992789fd391d4d..c2813aca865d01014c793a9df76ef5c99d27dd3b 100644
--- a/tests/base64.c
+++ b/tests/base64.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/base64.h"
 
 #define BUF_LEN			256
diff --git a/tests/descriptor.c b/tests/descriptor.c
index 85a98351bb52d8ab937f4fb4acaae7355107e5b5..7ed79722a9e300361285feb782a8581d5b4bdb70 100644
--- a/tests/descriptor.c
+++ b/tests/descriptor.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 #define BUF_LEN 256
 
diff --git a/tests/dnssec_nsec3.c b/tests/dnssec_nsec3.c
index 44f90cfce4ea54b5a517233303f9e248fbd5cd4b..72a6c36c73a7384e631625573bcf2fe1448f9af5 100644
--- a/tests/dnssec_nsec3.c
+++ b/tests/dnssec_nsec3.c
@@ -19,8 +19,8 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "common/descriptor.h"
-#include "common/errcode.h"
+#include "libknot/descriptor.h"
+#include "libknot/errcode.h"
 #include "libknot/dname.h"
 #include "libknot/consts.h"
 #include "libknot/rrset.h"
diff --git a/tests/dnssec_sign.c b/tests/dnssec_sign.c
index c53976e0501cef3b48cd061736a569bbfca78b5d..a7464a49e66809b7f84772e1c65b3c75fb7d0cc0 100644
--- a/tests/dnssec_sign.c
+++ b/tests/dnssec_sign.c
@@ -19,7 +19,7 @@
 #include <openssl/opensslconf.h>
 #include <tap/basic.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/dnssec/config.h"
 #include "libknot/dnssec/crypto.h"
 #include "libknot/dnssec/sign.h"
diff --git a/tests/edns.c b/tests/edns.c
index 476950557e52293f2ac67e1f89ca0a81e6b62fdd..2088127711d31f63acfeffc52ee82af71394e960 100644
--- a/tests/edns.c
+++ b/tests/edns.c
@@ -18,9 +18,9 @@
 #include <tap/basic.h>
 
 #include <assert.h>
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "libknot/rrtype/opt.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 static const uint16_t E_MAX_PLD = 10000;
 static const uint16_t E_MAX_PLD2 = 20000;
diff --git a/tests/fake_server.h b/tests/fake_server.h
index ddeb1744a1d368997bd53d67d7c99b957622deb5..0f3bea7ad0d4c4f91e10ed8f61db5e0eb74d2ee9 100644
--- a/tests/fake_server.h
+++ b/tests/fake_server.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "knot/server/server.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 
 /* Some domain names. */
 #define ROOT_DNAME ((const uint8_t *)"")
diff --git a/tests/hattrie.c b/tests/hattrie.c
index 8cd81dbaef433c2046dba12cfb766ad41bf5aa17..7e67eb71a26f6148d294301f33aadd51d54bdb06 100644
--- a/tests/hattrie.c
+++ b/tests/hattrie.c
@@ -19,7 +19,7 @@
 #include <time.h>
 #include <tap/basic.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/hattrie/hat-trie.h"
 
 /* Constants. */
diff --git a/tests/hhash.c b/tests/hhash.c
index 1e1c5ea1577709632715a604f46a9fc5fc0f614d..ca10eae5f36b5a69b8246fe09c97d32e3a1a6078 100644
--- a/tests/hhash.c
+++ b/tests/hhash.c
@@ -20,7 +20,7 @@
 #include <tap/basic.h>
 
 #include "common/hhash.h"
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/mempool.h"
 #include "libknot/common.h"
 
diff --git a/tests/node.c b/tests/node.c
index d55570d05c4d841c30c65bad8797531fba35ff59..e15daa6587bc322d563c38063c4c93e91379ae5b 100644
--- a/tests/node.c
+++ b/tests/node.c
@@ -19,7 +19,7 @@
 #include <tap/basic.h>
 
 #include "knot/zone/node.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 static knot_rrset_t *create_dummy_rrset(const knot_dname_t *owner,
                                         uint16_t type)
diff --git a/tests/pkt.c b/tests/pkt.c
index 418253bc1cc639affacf94cf8ba8221797296ebc..115e07204821a676d7e5a8b2a26bbff7dcc370d7 100644
--- a/tests/pkt.c
+++ b/tests/pkt.c
@@ -17,9 +17,9 @@
 #include <config.h>
 #include <tap/basic.h>
 
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "common/mempool.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/packet/pkt.h"
 #include "libknot/rrtype/tsig.h"
 
diff --git a/tests/process_answer.c b/tests/process_answer.c
index be6bd128bef645411af56b60b5940eb8ca8fc5b6..60ddb41d2b347477fe144784b75befee6bf23828 100644
--- a/tests/process_answer.c
+++ b/tests/process_answer.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include "common/mempool.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/packet/wire.h"
 #include "knot/nameserver/process_answer.h"
 #include "fake_server.h"
diff --git a/tests/process_query.c b/tests/process_query.c
index c29a226affe85ace463f2dcae975c754c92f777e..9c3335267669224b2fdc1f6349a5bd8c8dbd0cd6 100644
--- a/tests/process_query.c
+++ b/tests/process_query.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include "common/mempool.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 #include "libknot/packet/wire.h"
 #include "knot/nameserver/process_query.h"
 #include "fake_server.h"
diff --git a/tests/query_module.c b/tests/query_module.c
index 6b1ac1951aed8bf469db9eb31df711d0ed601221..ea775864b816e0f31d5f0952dd6abfd370196a8f 100644
--- a/tests/query_module.c
+++ b/tests/query_module.c
@@ -19,9 +19,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "common/mempattern.h"
+#include "libknot/mempattern.h"
 #include "common/mempool.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 #include "knot/nameserver/query_module.h"
 #include "libknot/packet/pkt.h"
 
diff --git a/tests/rdataset.c b/tests/rdataset.c
index 6d7dd4c9acd8e2057091fa8784b14c244923c778..681608dedfff253265ffc1c69bcc57d9bb1bb311 100644
--- a/tests/rdataset.c
+++ b/tests/rdataset.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "libknot/rdataset.h"
-#include "common/errcode.h"
+#include "libknot/errcode.h"
 
 // Inits rdataset with given rdata.
 #define RDATASET_INIT_WITH(set, rdata) \
diff --git a/tests/rrl.c b/tests/rrl.c
index e7e3b6648190bfe3648e5cb66455b1ed7a085316..4949f6de64bb14c9a0816b841e84ea4e64595962 100644
--- a/tests/rrl.c
+++ b/tests/rrl.c
@@ -22,7 +22,7 @@
 #include "knot/server/rrl.h"
 #include "knot/zone/zone.h"
 #include "knot/conf/conf.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 /* Enable time-dependent tests. */
 //#define ENABLE_TIMED_TESTS
diff --git a/tests/rrset.c b/tests/rrset.c
index f1b66839cc17f4be4360ab436767c15e68843019..1a32bff2e9c0419d23600d74ebabdf62512dc9e6 100644
--- a/tests/rrset.c
+++ b/tests/rrset.c
@@ -19,7 +19,7 @@
 #include <tap/basic.h>
 
 #include "libknot/rrset.h"
-#include "common/descriptor.h"
+#include "libknot/descriptor.h"
 
 /*
  *  Unit implementation.