diff --git a/image/main.c b/image/main.c
index 34988651..22986694 100644
--- a/image/main.c
+++ b/image/main.c
@@ -17,22 +17,31 @@
  */
 
 #include "kerncompat.h"
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <dirent.h>
 #include <getopt.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <string.h>
+#include <time.h>
 #include <zlib.h>
+#include "kernel-lib/list.h"
+#include "kernel-lib/rbtree.h"
+#include "kernel-lib/rbtree_types.h"
+#include "kernel-lib/sizes.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/transaction.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-shared/extent_io.h"
 #include "crypto/crc32c.h"
+#include "common/internal.h"
+#include "common/messages.h"
 #include "common/box.h"
 #include "common/utils.h"
 #include "common/extent-cache.h"
@@ -41,6 +50,7 @@
 #include "common/open-utils.h"
 #include "image/metadump.h"
 #include "image/sanitize.h"
+#include "ioctl.h"
 
 #define MAX_WORKER_THREADS	(32)
 
diff --git a/image/sanitize.c b/image/sanitize.c
index f83fb3e8..6022d930 100644
--- a/image/sanitize.c
+++ b/image/sanitize.c
@@ -15,6 +15,10 @@
  */
 
 #include "kerncompat.h"
+#include <stdlib.h>
+#include <string.h>
+#include "kernel-lib/rbtree.h"
+#include "kernel-shared/ctree.h"
 #include "kernel-shared/extent_io.h"
 #include "common/internal.h"
 #include "common/messages.h"
diff --git a/image/sanitize.h b/image/sanitize.h
index fc07a8a9..93fc093e 100644
--- a/image/sanitize.h
+++ b/image/sanitize.h
@@ -18,7 +18,10 @@
 #define __BTRFS_IMAGE_SANITIZE_H__
 
 #include "kerncompat.h"
-#include "image/metadump.h"
+#include "kernel-lib/rbtree_types.h"
+
+struct btrfs_key;
+struct extent_buffer;
 
 struct name {
 	struct rb_node n;