diff --git a/Android.mk b/Android.mk
index 7d10d58f..02a5f579 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,10 +31,10 @@ cmds_objects := cmds-subvolume.c cmds-filesystem.c cmds-device.c cmds-scrub.c \
                cmds-property.c cmds-fi-usage.c cmds-inspect-dump-tree.c \
                cmds-inspect-dump-super.c cmds-inspect-tree-stats.c cmds-fi-du.c \
                mkfs/common.c
-libbtrfs_objects := common/send-stream.c send-utils.c kernel-lib/rbtree.c btrfs-list.c \
+libbtrfs_objects := common/send-stream.c common/send-utils.c kernel-lib/rbtree.c btrfs-list.c \
                    crypto/crc32c.c messages.c \
                    uuid-tree.c common/utils-lib.c rbtree-utils.c
-libbtrfs_headers := common/send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
+libbtrfs_headers := common/send-stream.h common/send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
                    crypto/crc32c.h kernel-lib/list.h kerncompat.h \
                    kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
                    common/extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
diff --git a/Makefile b/Makefile
index 2e71c0be..bac96211 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
 	       cmds/property.o cmds/filesystem-usage.o cmds/inspect-dump-tree.o \
 	       cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \
 	       mkfs/common.o check/mode-common.o check/mode-lowmem.o
-libbtrfs_objects = common/send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
+libbtrfs_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.o btrfs-list.o \
 		   kernel-lib/radix-tree.o common/extent-cache.o extent_io.o \
 		   crypto/crc32c.o common/messages.o \
 		   kernel-shared/uuid-tree.o common/utils-lib.o common/rbtree-utils.o \
@@ -171,7 +171,7 @@ libbtrfs_objects = common/send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-l
 		   common/device-scan.o common/path-utils.o \
 		   common/utils.o libbtrfsutil/subvolume.o libbtrfsutil/stubs.o \
 		   crypto/hash.o crypto/xxhash.o $(CRYPTO_OBJECTS)
-libbtrfs_headers = common/send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
+libbtrfs_headers = common/send-stream.h common/send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
 	       crypto/crc32c.h kernel-lib/list.h kerncompat.h \
 	       kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
 	       common/extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
diff --git a/cmds/inspect.c b/cmds/inspect.c
index 2b136978..d5d2d452 100644
--- a/cmds/inspect.c
+++ b/cmds/inspect.c
@@ -27,7 +27,7 @@
 #include "ioctl.h"
 #include "common/utils.h"
 #include "ctree.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 #include "disk-io.h"
 #include "cmds/commands.h"
 #include "btrfs-list.h"
diff --git a/cmds/receive-dump.c b/cmds/receive-dump.c
index b27a2aee..648d9314 100644
--- a/cmds/receive-dump.c
+++ b/cmds/receive-dump.c
@@ -33,7 +33,7 @@
 #include <uuid/uuid.h>
 #include "common/utils.h"
 #include "cmds/commands.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 #include "common/send-stream.h"
 #include "cmds/receive-dump.h"
 
diff --git a/cmds/receive.c b/cmds/receive.c
index 77e11bec..628f7beb 100644
--- a/cmds/receive.c
+++ b/cmds/receive.c
@@ -48,7 +48,7 @@
 
 #include "send.h"
 #include "common/send-stream.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 #include "cmds/receive-dump.h"
 #include "common/help.h"
 #include "common/path-utils.h"
diff --git a/cmds/send.c b/cmds/send.c
index 317a0139..1ac0c5dc 100644
--- a/cmds/send.c
+++ b/cmds/send.c
@@ -42,7 +42,7 @@
 #include "common/utils.h"
 
 #include "send.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 #include "common/help.h"
 #include "common/path-utils.h"
 
diff --git a/send-utils.c b/common/send-utils.c
similarity index 99%
rename from send-utils.c
rename to common/send-utils.c
index 29ff8366..7de1f7c0 100644
--- a/send-utils.c
+++ b/common/send-utils.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include "ctree.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 #include "ioctl.h"
 #include "btrfs-list.h"
 
diff --git a/send-utils.h b/common/send-utils.h
similarity index 100%
rename from send-utils.h
rename to common/send-utils.h
diff --git a/libbtrfs.sym b/libbtrfs.sym
index 63aa5765..47995d2c 100644
--- a/libbtrfs.sym
+++ b/libbtrfs.sym
@@ -44,7 +44,7 @@ global:
 	/* common/send-stream.h */
 	btrfs_read_and_process_send_stream;
 
-	/* send-utils.h */
+	/* common/send-utils.h */
 	subvol_uuid_search;
 	subvol_uuid_search2;
 	subvol_uuid_search_add;
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index c86159e7..a57106b0 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -34,7 +34,7 @@
 #include "common/utils.h"
 #include "mkfs/rootdir.h"
 #include "mkfs/common.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 
 static u32 fs_block_size;
 
diff --git a/tests/library-test.c b/tests/library-test.c
index 4b012bab..de8fffd6 100644
--- a/tests/library-test.c
+++ b/tests/library-test.c
@@ -32,7 +32,7 @@
 #include "common/extent-cache.h"
 #include "send.h"
 #include "common/send-stream.h"
-#include "send-utils.h"
+#include "common/send-utils.h"
 #else
 /*
  * This needs to include headers the same way as an external program but must