diff --git a/libknot/hash/cuckoo-hash-table.c b/libknot/hash/cuckoo-hash-table.c
index 81d77e291a21789409119e6ea61df981c982ccd7..3ef4f29622ef24652f1f596e71a1f14db98e840e 100644
--- a/libknot/hash/cuckoo-hash-table.c
+++ b/libknot/hash/cuckoo-hash-table.c
@@ -8,11 +8,11 @@
 
 #include <urcu.h>
 
-#include "dnslib/utils.h"
-#include "dnslib/dnslib-common.h"
-#include "dnslib/debug.h"
-#include "dnslib/hash/cuckoo-hash-table.h"
-#include "dnslib/hash/hash-functions.h"
+#include "utils.h"
+#include "common.h"
+#include "debug.h"
+#include "hash/cuckoo-hash-table.h"
+#include "hash/hash-functions.h"
 #include "common/dynamic-array.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/libknot/hash/cuckoo-hash-table.h b/libknot/hash/cuckoo-hash-table.h
index dac4826213a6c251da73e15b0e3c748c7e73bf48..de851cc0f184ddf8d2655020e8465a5d529473eb 100644
--- a/libknot/hash/cuckoo-hash-table.h
+++ b/libknot/hash/cuckoo-hash-table.h
@@ -18,14 +18,14 @@
  * \addtogroup hashing
  * @{
  */
-#ifndef _KNOTDCUCKOO_HASH_TABLE_H_
-#define _KNOTDCUCKOO_HASH_TABLE_H_
+#ifndef _KNOT_CUCKOO_HASH_TABLE_H_
+#define _KNOT_CUCKOO_HASH_TABLE_H_
 
 #include <stdint.h> /* uint32_t */
 #include <stdlib.h> /* size_t */
 #include <pthread.h>
 
-#include "dnslib/hash/universal-system.h"
+#include "hash/universal-system.h"
 #include "common/dynamic-array.h"
 
 /*----------------------------------------------------------------------------*/
diff --git a/libknot/hash/hash-functions.h b/libknot/hash/hash-functions.h
index e790c244b3550f79bfbe71ec072e00318b9e8670..872a802f69641f51dc308baffc250d36a58a4b62 100644
--- a/libknot/hash/hash-functions.h
+++ b/libknot/hash/hash-functions.h
@@ -13,8 +13,8 @@
  * @{
  */
 
-#ifndef _KNOTDHASH_FUNCTIONS_H_
-#define _KNOTDHASH_FUNCTIONS_H_
+#ifndef _KNOT_HASH_FUNCTIONS_H_
+#define _KNOT_HASH_FUNCTIONS_H_
 
 typedef  unsigned long int  u4;   /* unsigned 4-byte type */
 typedef  unsigned     char  u1;   /* unsigned 1-byte type */
diff --git a/libknot/hash/universal-system.c b/libknot/hash/universal-system.c
index 0b871f1d910553d9587897f37372678d360dc6cf..5e5c9c4a745d80e02c4cbe608be1efe9cfebf4c3 100644
--- a/libknot/hash/universal-system.c
+++ b/libknot/hash/universal-system.c
@@ -7,7 +7,7 @@
 #include <assert.h>
 
 #include "universal-system.h"
-#include "dnslib/utils.h"
+#include "utils.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/libknot/hash/universal-system.h b/libknot/hash/universal-system.h
index 7461f1d82c5aae98da0ec00039edacb227a3f4b7..1bd822237334820c86b8922456ed1d6802a75a1e 100644
--- a/libknot/hash/universal-system.h
+++ b/libknot/hash/universal-system.h
@@ -24,11 +24,11 @@
  * @{
  */
 
-#ifndef _KNOTDUNIVERSAL_SYSTEM_H_
-#define _KNOTDUNIVERSAL_SYSTEM_H_
+#ifndef _KNOT_UNIVERSAL_SYSTEM_H_
+#define _KNOT_UNIVERSAL_SYSTEM_H_
 
 #include <stdint.h>
-#include "dnslib/dnslib-common.h"
+#include "libknot.h"
 
 
 enum { US_FNC_COUNT = 4 /*!< Number of functions for one generation. */ };