diff --git a/Android.mk b/Android.mk
index fbcadf3f..1c9cf615 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@ STATIC_LIBS := -luuid   -lblkid -luuid -lz   -llzo2 -L. -pthread
 btrfs_shared_libraries := libext2_uuid \
 			libext2_blkid
 
-objects := ctree.c disk-io.c kernel-lib/radix-tree.c kernel-shared/extent-tree.c \
+objects := ctree.c kernel-shared/disk-io.c kernel-lib/radix-tree.c kernel-shared/extent-tree.c \
 	  kernel-shared/print-tree.c \
           root-tree.c dir-item.c file-item.c inode-item.c inode-map.c \
           common/extent-cache.c kernel-shared/extent_io.c volumes.c utils.c repair.c \
diff --git a/Makefile b/Makefile
index 38a04595..0c5c183a 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ libbtrfs_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.o
 		   kernel-lib/radix-tree.o common/extent-cache.o kernel-shared/extent_io.o \
 		   crypto/crc32c.o common/messages.o \
 		   kernel-shared/uuid-tree.o common/utils-lib.o common/rbtree-utils.o \
-		   ctree.o disk-io.o kernel-shared/extent-tree.o kernel-shared/delayed-ref.o \
+		   ctree.o kernel-shared/disk-io.o kernel-shared/extent-tree.o kernel-shared/delayed-ref.o \
 		   kernel-shared/print-tree.o \
 		   kernel-shared/free-space-cache.o kernel-shared/root-tree.o volumes.o transaction.o \
 		   kernel-shared/free-space-tree.o repair.o kernel-shared/inode-item.o \
diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c
index 36c97aac..aada694b 100644
--- a/btrfs-corrupt-block.c
+++ b/btrfs-corrupt-block.c
@@ -26,7 +26,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 84ce1b2e..fdd268c6 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -26,7 +26,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"
diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c
index 852aa5a2..26fc5b76 100644
--- a/btrfs-map-logical.c
+++ b/btrfs-map-logical.c
@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"
diff --git a/btrfs-sb-mod.c b/btrfs-sb-mod.c
index ad143ca0..d0222db3 100644
--- a/btrfs-sb-mod.c
+++ b/btrfs-sb-mod.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <byteswap.h>
 #include "crypto/crc32c.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #define BLOCKSIZE (4096)
 static char buf[BLOCKSIZE];
diff --git a/btrfs-select-super.c b/btrfs-select-super.c
index ddb47cd3..f59964e4 100644
--- a/btrfs-select-super.c
+++ b/btrfs-select-super.c
@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"
diff --git a/btrfstune.c b/btrfstune.c
index afa3aae3..7d95334b 100644
--- a/btrfstune.c
+++ b/btrfstune.c
@@ -28,7 +28,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "volumes.h"
diff --git a/check/main.c b/check/main.c
index 6a23c99e..d7b1ea58 100644
--- a/check/main.c
+++ b/check/main.c
@@ -29,7 +29,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "repair.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/task-utils.h"
 #include "transaction.h"
diff --git a/check/mode-common.c b/check/mode-common.c
index 9ecfd260..2c54e709 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -20,7 +20,7 @@
 #include "common/messages.h"
 #include "transaction.h"
 #include "common/utils.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "repair.h"
 #include "check/mode-common.h"
 
diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 3d653552..14e64330 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -19,7 +19,7 @@
 #include "repair.h"
 #include "transaction.h"
 #include "common/messages.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/backref.h"
 #include "common/internal.h"
 #include "common/utils.h"
diff --git a/check/qgroup-verify.c b/check/qgroup-verify.c
index a53e08ac..19fa0be0 100644
--- a/check/qgroup-verify.c
+++ b/check/qgroup-verify.c
@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 #include "kernel-shared/ulist.h"
diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
index 85c21ffd..44dad4f9 100644
--- a/cmds/filesystem-usage.c
+++ b/cmds/filesystem-usage.c
@@ -30,7 +30,7 @@
 #include "common/string-table.h"
 #include "cmds/filesystem-usage.h"
 #include "cmds/commands.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #include "version.h"
 #include "common/help.h"
diff --git a/cmds/filesystem.c b/cmds/filesystem.c
index 6c1b6908..dc29a72e 100644
--- a/cmds/filesystem.c
+++ b/cmds/filesystem.c
@@ -38,7 +38,7 @@
 #include "cmds/commands.h"
 #include "cmds/filesystem-usage.h"
 #include "kernel-lib/list_sort.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/help.h"
 #include "common/fsfeatures.h"
 #include "common/path-utils.h"
diff --git a/cmds/inspect-dump-super.c b/cmds/inspect-dump-super.c
index 1d38afd6..59690c51 100644
--- a/cmds/inspect-dump-super.c
+++ b/cmds/inspect-dump-super.c
@@ -23,7 +23,7 @@
 #include <getopt.h>
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 #include "cmds/commands.h"
diff --git a/cmds/inspect-dump-tree.c b/cmds/inspect-dump-tree.c
index 7a4f2ff8..28b3e0de 100644
--- a/cmds/inspect-dump-tree.c
+++ b/cmds/inspect-dump-tree.c
@@ -26,7 +26,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "volumes.h"
diff --git a/cmds/inspect-tree-stats.c b/cmds/inspect-tree-stats.c
index 428d2e7b..77e785de 100644
--- a/cmds/inspect-tree-stats.c
+++ b/cmds/inspect-tree-stats.c
@@ -28,7 +28,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"
diff --git a/cmds/inspect.c b/cmds/inspect.c
index d5d2d452..b60cc479 100644
--- a/cmds/inspect.c
+++ b/cmds/inspect.c
@@ -28,7 +28,7 @@
 #include "common/utils.h"
 #include "ctree.h"
 #include "common/send-utils.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "cmds/commands.h"
 #include "btrfs-list.h"
 #include "common/help.h"
diff --git a/cmds/replace.c b/cmds/replace.c
index 84fcb80e..09c798d1 100644
--- a/cmds/replace.c
+++ b/cmds/replace.c
@@ -34,7 +34,7 @@
 #include "ioctl.h"
 #include "common/utils.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #include "cmds/commands.h"
 #include "common/help.h"
diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c
index 33c07d5a..2483a38f 100644
--- a/cmds/rescue-chunk-recover.c
+++ b/cmds/rescue-chunk-recover.c
@@ -33,7 +33,7 @@
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "common/extent-cache.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"
diff --git a/cmds/rescue-super-recover.c b/cmds/rescue-super-recover.c
index 3a60eb40..b4540c53 100644
--- a/cmds/rescue-super-recover.c
+++ b/cmds/rescue-super-recover.c
@@ -28,7 +28,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-lib/list.h"
 #include "common/utils.h"
 #include "crypto/crc32c.h"
diff --git a/cmds/rescue.c b/cmds/rescue.c
index fa44322f..2b254da0 100644
--- a/cmds/rescue.c
+++ b/cmds/rescue.c
@@ -22,7 +22,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "cmds/commands.h"
 #include "common/utils.h"
 #include "common/help.h"
diff --git a/cmds/restore.c b/cmds/restore.c
index f017f964..99cf7acf 100644
--- a/cmds/restore.c
+++ b/cmds/restore.c
@@ -38,7 +38,7 @@
 #include <sys/xattr.h>
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"
diff --git a/cmds/scrub.c b/cmds/scrub.c
index 8f983ee9..6d429c96 100644
--- a/cmds/scrub.c
+++ b/cmds/scrub.c
@@ -41,7 +41,7 @@
 #include "ioctl.h"
 #include "common/utils.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #include "cmds/commands.h"
 #include "common/help.h"
diff --git a/common/device-scan.c b/common/device-scan.c
index c0e9167a..b00bc765 100644
--- a/common/device-scan.c
+++ b/common/device-scan.c
@@ -34,7 +34,7 @@
 #include "common/defs.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "ioctl.h"
 
 static int btrfs_scan_done = 0;
diff --git a/common/device-utils.c b/common/device-utils.c
index b03d62fa..c860b946 100644
--- a/common/device-utils.c
+++ b/common/device-utils.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <blkid/blkid.h>
 #include "kernel-lib/sizes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/device-utils.h"
 #include "common/internal.h"
 #include "common/messages.h"
diff --git a/common/utils.c b/common/utils.c
index 9742c2e1..22c61722 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -45,7 +45,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"
 #include "common/utils.h"
diff --git a/convert/common.c b/convert/common.c
index 0a7d2e20..ee6dc07b 100644
--- a/convert/common.c
+++ b/convert/common.c
@@ -16,7 +16,7 @@
 
 #include <unistd.h>
 #include <uuid/uuid.h>
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "common/path-utils.h"
diff --git a/convert/main.c b/convert/main.c
index 529fb54c..05387655 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -92,7 +92,7 @@
 #include <stdbool.h>
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "common/utils.h"
diff --git a/convert/source-ext2.c b/convert/source-ext2.c
index 2eda90ba..9d0d774d 100644
--- a/convert/source-ext2.c
+++ b/convert/source-ext2.c
@@ -19,7 +19,7 @@
 #include "kerncompat.h"
 #include <linux/limits.h>
 #include <pthread.h>
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "convert/common.h"
diff --git a/convert/source-fs.c b/convert/source-fs.c
index 34c49e0f..d565a8c4 100644
--- a/convert/source-fs.c
+++ b/convert/source-fs.c
@@ -17,7 +17,7 @@
 #include "kerncompat.h"
 #include <unistd.h>
 #include "common/internal.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "convert/common.h"
 #include "convert/source-fs.h"
diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c
index 3b4cb5ad..acd06495 100644
--- a/convert/source-reiserfs.c
+++ b/convert/source-reiserfs.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <stdbool.h>
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "kernel-lib/bitops.h"
diff --git a/ctree.c b/ctree.c
index f652cf25..c631cc05 100644
--- a/ctree.c
+++ b/ctree.c
@@ -16,7 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/print-tree.h"
 #include "repair.h"
diff --git a/file.c b/file.c
index e2cf6030..7aa506bd 100644
--- a/file.c
+++ b/file.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include "ctree.h"
 #include "common/utils.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kerncompat.h"
 
diff --git a/find-root.c b/find-root.c
index 4054e2b1..7cb3a357 100644
--- a/find-root.c
+++ b/find-root.c
@@ -24,7 +24,7 @@
 #include "common/utils.h"
 #include "find-root.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/extent-cache.h"
 
 /* Return value is the same as btrfs_find_root_search(). */
diff --git a/image/main.c b/image/main.c
index fe61f82e..f49fcd02 100644
--- a/image/main.c
+++ b/image/main.c
@@ -30,7 +30,7 @@
 #include "kerncompat.h"
 #include "crypto/crc32c.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "volumes.h"
diff --git a/inode.c b/inode.c
index c2d77aa6..76b5bc94 100644
--- a/inode.c
+++ b/inode.c
@@ -26,7 +26,7 @@
 
 #include "ctree.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "time.h"
 #include "common/messages.h"
 #include "common/internal.h"
diff --git a/kernel-lib/raid56.c b/kernel-lib/raid56.c
index 19beef43..eb1b39be 100644
--- a/kernel-lib/raid56.c
+++ b/kernel-lib/raid56.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "kernel-lib/raid56.h"
diff --git a/kernel-shared/backref.c b/kernel-shared/backref.c
index 91813cb1..c80630a5 100644
--- a/kernel-shared/backref.c
+++ b/kernel-shared/backref.c
@@ -18,7 +18,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/backref.h"
 #include "kernel-shared/ulist.h"
 #include "transaction.h"
diff --git a/kernel-shared/dir-item.c b/kernel-shared/dir-item.c
index c8a5a354..edb05ec1 100644
--- a/kernel-shared/dir-item.c
+++ b/kernel-shared/dir-item.c
@@ -18,7 +18,7 @@
 
 #include <linux/limits.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 
 static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
diff --git a/disk-io.c b/kernel-shared/disk-io.c
similarity index 99%
rename from disk-io.c
rename to kernel-shared/disk-io.c
index d45d27a0..fc40264b 100644
--- a/disk-io.c
+++ b/kernel-shared/disk-io.c
@@ -26,7 +26,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"
diff --git a/disk-io.h b/kernel-shared/disk-io.h
similarity index 100%
rename from disk-io.h
rename to kernel-shared/disk-io.h
diff --git a/kernel-shared/extent-tree.c b/kernel-shared/extent-tree.c
index 751e3225..44073645 100644
--- a/kernel-shared/extent-tree.c
+++ b/kernel-shared/extent-tree.c
@@ -24,7 +24,7 @@
 #include "kernel-lib/radix-tree.h"
 #include "kernel-lib/rbtree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"
diff --git a/kernel-shared/file-item.c b/kernel-shared/file-item.c
index 443dc9bc..1ce5a62b 100644
--- a/kernel-shared/file-item.c
+++ b/kernel-shared/file-item.c
@@ -21,7 +21,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/print-tree.h"
 #include "crypto/crc32c.h"
diff --git a/kernel-shared/free-space-cache.c b/kernel-shared/free-space-cache.c
index 8d5bddb9..5ffb5ffd 100644
--- a/kernel-shared/free-space-cache.c
+++ b/kernel-shared/free-space-cache.c
@@ -20,7 +20,7 @@
 #include "ctree.h"
 #include "kernel-shared/free-space-cache.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/extent_io.h"
 #include "crypto/crc32c.h"
 #include "kernel-lib/bitops.h"
diff --git a/kernel-shared/free-space-tree.c b/kernel-shared/free-space-tree.c
index bd6a449b..7d2c3517 100644
--- a/kernel-shared/free-space-tree.c
+++ b/kernel-shared/free-space-tree.c
@@ -17,7 +17,7 @@
  */
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/free-space-cache.h"
 #include "kernel-shared/free-space-tree.h"
 #include "volumes.h"
diff --git a/kernel-shared/inode-item.c b/kernel-shared/inode-item.c
index aef1a235..7f454e9e 100644
--- a/kernel-shared/inode-item.c
+++ b/kernel-shared/inode-item.c
@@ -17,7 +17,7 @@
  */
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 
 static int find_name_in_backref(struct btrfs_path *path, const char * name,
diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c
index 0d4f96ff..732d7d7b 100644
--- a/kernel-shared/print-tree.c
+++ b/kernel-shared/print-tree.c
@@ -23,7 +23,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 
diff --git a/kernel-shared/root-tree.c b/kernel-shared/root-tree.c
index 7bec7450..f8acd682 100644
--- a/kernel-shared/root-tree.c
+++ b/kernel-shared/root-tree.c
@@ -18,7 +18,7 @@
 
 #include "ctree.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 
 int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
diff --git a/kernel-shared/uuid-tree.c b/kernel-shared/uuid-tree.c
index e781799c..ff93729a 100644
--- a/kernel-shared/uuid-tree.c
+++ b/kernel-shared/uuid-tree.c
@@ -21,7 +21,7 @@
 #include <sys/ioctl.h>
 #include "ctree.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 
diff --git a/mkfs/common.c b/mkfs/common.c
index 469b88d6..cd08fa58 100644
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -20,7 +20,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "common/path-utils.h"
diff --git a/mkfs/main.c b/mkfs/main.c
index 6c9a24a4..e9d001b3 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <blkid/blkid.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "common/utils.h"
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index a57106b0..c9eb9295 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -28,7 +28,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "common/internal.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/messages.h"
 #include "transaction.h"
 #include "common/utils.h"
diff --git a/quick-test.c b/quick-test.c
index 1fd259ab..ec5b4959 100644
--- a/quick-test.c
+++ b/quick-test.c
@@ -22,7 +22,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 
diff --git a/random-test.c b/random-test.c
index 4f47bbc9..2b9bd5d8 100644
--- a/random-test.c
+++ b/random-test.c
@@ -22,7 +22,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 
diff --git a/transaction.c b/transaction.c
index 0917abca..465d9533 100644
--- a/transaction.c
+++ b/transaction.c
@@ -15,7 +15,7 @@
  */
 
 #include "kerncompat.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/delayed-ref.h"
 #include "common/messages.h"
diff --git a/volumes.c b/volumes.c
index cb32513b..0143cc92 100644
--- a/volumes.c
+++ b/volumes.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/print-tree.h"
 #include "volumes.h"