diff --git a/lib/bitlk/bitlk.c b/lib/bitlk/bitlk.c
index 49a87567..483539bb 100644
--- a/lib/bitlk/bitlk.c
+++ b/lib/bitlk/bitlk.c
@@ -21,19 +21,15 @@
  */
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-#include <assert.h>
 #include <uuid/uuid.h>
 #include <time.h>
 #include <iconv.h>
+#include <limits.h>
 
-#include "libcryptsetup.h"
 #include "bitlk.h"
 #include "internal.h"
-#include "bitops.h"
 
 #define BITLK_BOOTCODE_V1 "\xeb\x52\x90"
 #define BITLK_BOOTCODE_V2 "\xeb\x58\x90"
@@ -364,10 +360,10 @@ int BITLK_read_sb(struct crypt_device *cd, struct bitlk_metadata *params)
 {
 	int devfd;
 	struct device *device = crypt_metadata_device(cd);
-	struct bitlk_signature sig = {0};
-	struct bitlk_superblock sb = {0};
-	struct bitlk_fve_metadata fve = {0};
-	struct bitlk_entry_vmk entry_vmk = {0};
+	struct bitlk_signature sig = {};
+	struct bitlk_superblock sb = {};
+	struct bitlk_fve_metadata fve = {};
+	struct bitlk_entry_vmk entry_vmk = {};
 	uint8_t *fve_entries = NULL;
 	int fve_offset = 0;
 	char guid_buf[UUID_STR_LEN] = {0};
@@ -716,7 +712,7 @@ static int bitlk_kdf(struct crypt_device *cd,
 		     const uint8_t *salt,
 		     struct volume_key **vk)
 {
-	struct bitlk_kdf_data kdf = {0};
+	struct bitlk_kdf_data kdf = {};
 	struct crypt_hash *hd = NULL;
 	int len = 0;
 	char *utf16Password = NULL;
diff --git a/lib/bitlk/bitlk.h b/lib/bitlk/bitlk.h
index 03ac25f2..8a2ce263 100644
--- a/lib/bitlk/bitlk.h
+++ b/lib/bitlk/bitlk.h
@@ -23,14 +23,12 @@
 #ifndef _CRYPTSETUP_BITLK_H
 #define _CRYPTSETUP_BITLK_H
 
-#include <stdint.h>
 #include <stddef.h>
-
-#include "internal.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 struct crypt_device;
 struct device;
-struct crypt_params_bitlk;
 
 #define BITLK_NONCE_SIZE 12
 #define BITLK_SALT_SIZE 16