Fix some includes.

lib/bitlk/bitlk.h

@@ -29,6 +29,7 @@
 
 struct crypt_device;
 struct device;
+struct volume_key;
 
 #define BITLK_NONCE_SIZE 12
 #define BITLK_SALT_SIZE 16

lib/crypto_backend/crypto_storage.c

@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <strings.h>
 #include "bitops.h"
 #include "crypto_backend.h"
 

lib/libdevmapper.c

@@ -24,10 +24,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <ctype.h>
-#include <dirent.h>
 #include <errno.h>
 #include <libdevmapper.h>
-#include <linux/fs.h>
 #include <uuid/uuid.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_SYSMACROS_H

lib/loopaes/loopaes.h

@@ -23,7 +23,7 @@
 #define _LOOPAES_H
 
 #include <stdint.h>
-#include <unistd.h>
+#include <stddef.h>
 
 struct crypt_device;
 struct volume_key;

lib/luks1/af.h

@@ -26,6 +26,9 @@
 
 #include <stddef.h>
 
+struct crypt_device;
+struct volume_key;
+
 /*
  * AF_split operates on src and produces information split data in
  * dst. src is assumed to be of the length blocksize. The data stripe

lib/tcrypt/tcrypt.h

@@ -75,7 +75,6 @@ struct tcrypt_phdr {
 
 struct crypt_device;
 struct crypt_params_tcrypt;
-struct crypt_dm_active_device;
 struct dm_target;
 struct volume_key;
 struct device;

lib/utils_crypt.c

@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
+#include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 

lib/utils_crypt.h

@@ -24,7 +24,6 @@
 #define _UTILS_CRYPT_H
 
 #include <stdbool.h>
-#include <unistd.h>
 
 #define MAX_CIPHER_LEN		32
 #define MAX_CIPHER_LEN_STR	"31"

lib/utils_io.c

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <sys/types.h>
 
 #include "utils_io.h"
 

lib/utils_io.h

@@ -24,6 +24,7 @@
 #ifndef _CRYPTSETUP_UTILS_IO_H
 #define _CRYPTSETUP_UTILS_IO_H
 
+#include <stddef.h>
 #include <sys/types.h>
 
 ssize_t read_buffer(int fd, void *buf, size_t length);

lib/utils_loop.c

@@ -28,10 +28,10 @@
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>     /* for major, minor */
 #endif
+#include <linux/types.h>
 #include <linux/loop.h>
 
 #include "utils_loop.h"

src/integritysetup.c

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
 #include <uuid/uuid.h>
 
 #define DEFAULT_ALG_NAME "crc32c"