diff --git a/Android.mk b/Android.mk
index 77975636..21d00992 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,7 +33,7 @@ cmds_objects := cmds-subvolume.c cmds-filesystem.c cmds-device.c cmds-scrub.c \
                mkfs/common.c
 libbtrfs_objects := send-stream.c send-utils.c kernel-lib/rbtree.c btrfs-list.c \
                    crypto/crc32c.c messages.c \
-                   uuid-tree.c utils-lib.c rbtree-utils.c
+                   uuid-tree.c common/utils-lib.c rbtree-utils.c
 libbtrfs_headers := send-stream.h 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 \
diff --git a/Makefile b/Makefile
index 9a3441e4..ff5f60a3 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
 libbtrfs_objects = send-stream.o 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 utils-lib.o common/rbtree-utils.o \
+		   kernel-shared/uuid-tree.o common/utils-lib.o common/rbtree-utils.o \
 		   ctree.o disk-io.o extent-tree.o kernel-shared/delayed-ref.o print-tree.o \
 		   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/utils-lib.c b/common/utils-lib.c
similarity index 100%
rename from utils-lib.c
rename to common/utils-lib.c