diff --git a/Knot.files b/Knot.files
index 708db29fe1b04618435ec36860e1ac6137f353d6..350c24524960af4e99199ff51184372ccdead8cd 100644
--- a/Knot.files
+++ b/Knot.files
@@ -180,12 +180,12 @@ src/libknot/consts.c
 src/libknot/consts.h
 src/libknot/dname.c
 src/libknot/dname.h
+src/libknot/dnssec/bitmap.h
 src/libknot/dnssec/config.h
 src/libknot/dnssec/crypto.c
 src/libknot/dnssec/crypto.h
 src/libknot/dnssec/key.c
 src/libknot/dnssec/key.h
-src/libknot/dnssec/nsec-bitmap.h
 src/libknot/dnssec/nsec3.c
 src/libknot/dnssec/nsec3.h
 src/libknot/dnssec/policy.c
diff --git a/src/knot/dnssec/nsec-chain.h b/src/knot/dnssec/nsec-chain.h
index 3e0e1828cf83ee0a4120ffb668ee47bc3f9212e9..9402353d28c7f7dc91d25e321266b9272656a83a 100644
--- a/src/knot/dnssec/nsec-chain.h
+++ b/src/knot/dnssec/nsec-chain.h
@@ -33,6 +33,7 @@
 
 #include "knot/zone/zone-contents.h"
 #include "knot/updates/changesets.h"
+#include "libknot/dnssec/bitmap.h"
 
 /*!
  * \brief Parameters to be used when fixing NSEC(3) chain.
@@ -82,6 +83,22 @@ typedef int (*chain_finalize_cb)(chain_fix_data_t *);
 typedef int (*chain_iterate_create_cb)(knot_node_t *, knot_node_t *,
                                        nsec_chain_iterate_data_t *);
 
+
+/*!
+ * \brief Add all RR types from a node into the bitmap.
+ */
+inline static void bitmap_add_node_rrsets(bitmap_t *bitmap,
+                                          const knot_node_t *node)
+{
+	const knot_rrset_t **node_rrsets = knot_node_rrsets_no_copy(node);
+	for (int i = 0; i < node->rrset_count; i++) {
+		const knot_rrset_t *rr = node_rrsets[i];
+		if (rr->type != KNOT_RRTYPE_NSEC && rr->rdata_count > 0) {
+			bitmap_add_type(bitmap, node_rrsets[i]->type);
+		}
+	}
+}
+
 /*!
  * \brief Call a function for each piece of the chain formed by sorted nodes.
  *
diff --git a/src/knot/dnssec/nsec3-chain.c b/src/knot/dnssec/nsec3-chain.c
index c9db7d7ef275e931284194b8d65ac47c960db3a3..a760e8f9424b25c030d9b6f1f57165c534d2cf60 100644
--- a/src/knot/dnssec/nsec3-chain.c
+++ b/src/knot/dnssec/nsec3-chain.c
@@ -26,7 +26,7 @@
 #include "knot/dnssec/nsec-chain.h"
 #include "knot/dnssec/zone-sign.h"
 #include "knot/dnssec/zone-nsec.h"
-#include "libknot/dnssec/nsec-bitmap.h"
+#include "libknot/dnssec/bitmap.h"
 
 /* - Forward declarations --------------------------------------------------- */
 
diff --git a/src/knot/dnssec/zone-nsec.c b/src/knot/dnssec/zone-nsec.c
index 1f0627e894c34d32df2c05275fe85c7e4aa6a626..2cee405f9095d9fc37a31b8a4b15cd1acefc843b 100644
--- a/src/knot/dnssec/zone-nsec.c
+++ b/src/knot/dnssec/zone-nsec.c
@@ -26,7 +26,7 @@
 #include "common/hhash.h"
 #include "knot/dnssec/nsec-chain.h"
 #include "knot/dnssec/nsec3-chain.h"
-#include "libknot/dnssec/nsec-bitmap.h"
+#include "libknot/dnssec/bitmap.h"
 #include "libknot/dnssec/nsec3.h"
 #include "knot/dnssec/zone-nsec.h"
 #include "knot/dnssec/zone-sign.h"
diff --git a/src/knot/dnssec/zone-nsec.h b/src/knot/dnssec/zone-nsec.h
index c4ad36773dee5dc5f529510c89da0d0bada8e1fd..aa7f53956363fd9bc8347756201a2f3f0992f700 100644
--- a/src/knot/dnssec/zone-nsec.h
+++ b/src/knot/dnssec/zone-nsec.h
@@ -34,7 +34,7 @@
 #include "knot/zone/zone-contents.h"
 #include "libknot/dnssec/policy.h"
 #include "knot/dnssec/zone-keys.h"
-#include "libknot/dnssec/nsec-bitmap.h"
+#include "libknot/dnssec/bitmap.h"
 
 /*!
  * Check if NSEC3 is enabled for the given zone.
diff --git a/src/libknot/dnssec/nsec-bitmap.h b/src/libknot/dnssec/bitmap.h
similarity index 83%
rename from src/libknot/dnssec/nsec-bitmap.h
rename to src/libknot/dnssec/bitmap.h
index d69689b5c7413de368f7a9c2f624d252fb8e98c6..5f605f9b9564eb365593a605d1f2b2e90a0ad474 100644
--- a/src/libknot/dnssec/nsec-bitmap.h
+++ b/src/libknot/dnssec/bitmap.h
@@ -14,7 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /*!
- * \file nsec-bitmap.h
+ * \file bitmap.h
  *
  * \author Jan Vcelak <jan.vcelak@nic.cz>
  *
@@ -30,8 +30,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <limits.h>
-#include "knot/zone/node.h"
-#include "libknot/rrset.h"
 #include "common/descriptor.h"
 
 #define BITMAP_WINDOW_SIZE 256
@@ -76,21 +74,6 @@ inline static void bitmap_add_type(bitmap_t *bitmap, uint16_t type)
 	}
 }
 
-/*!
- * \brief Add all RR types from a node into the bitmap.
- */
-inline static void bitmap_add_node_rrsets(bitmap_t *bitmap,
-                                          const knot_node_t *node)
-{
-	const knot_rrset_t **node_rrsets = knot_node_rrsets_no_copy(node);
-	for (int i = 0; i < node->rrset_count; i++) {
-		const knot_rrset_t *rr = node_rrsets[i];
-		if (rr->type != KNOT_RRTYPE_NSEC && rr->rdata_count > 0) {
-			bitmap_add_type(bitmap, node_rrsets[i]->type);
-		}
-	}
-}
-
 /*!
  * \brief Compute the size of the bitmap in NSEC RDATA format.
  */