diff --git a/Makefile b/Makefile
index cd571513..8ae28c4d 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
 	       mkfs/common.o check/mode-common.o check/mode-lowmem.o
 libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
 		   kernel-lib/crc32c.o common/messages.o \
-		   uuid-tree.o utils-lib.o rbtree-utils.o
+		   uuid-tree.o utils-lib.o common/rbtree-utils.o
 libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
 	       kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
 	       kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
diff --git a/btrfs-list.c b/btrfs-list.c
index 7da5a417..6e161928 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -32,7 +32,7 @@
 #include "ioctl.h"
 #include <uuid/uuid.h>
 #include "btrfs-list.h"
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 
 #define BTRFS_LIST_NFILTERS_INCREASE	(2 * BTRFS_LIST_FILTER_MAX)
 #define BTRFS_LIST_NCOMPS_INCREASE	(2 * BTRFS_LIST_COMP_MAX)
diff --git a/check/main.c b/check/main.c
index 8688a4ad..bb57933b 100644
--- a/check/main.c
+++ b/check/main.c
@@ -39,7 +39,7 @@
 #include "free-space-tree.h"
 #include "btrfsck.h"
 #include "qgroup-verify.h"
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 #include "backref.h"
 #include "kernel-shared/ulist.h"
 #include "hash.h"
diff --git a/check/mode-original.h b/check/mode-original.h
index f4334d9d..78d6bb30 100644
--- a/check/mode-original.h
+++ b/check/mode-original.h
@@ -21,7 +21,7 @@
 #ifndef __BTRFS_CHECK_MODE_ORIGINAL_H__
 #define __BTRFS_CHECK_MODE_ORIGINAL_H__
 
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 
 struct extent_backref {
 	struct rb_node node;
diff --git a/rbtree-utils.c b/common/rbtree-utils.c
similarity index 98%
rename from rbtree-utils.c
rename to common/rbtree-utils.c
index 7371bbb4..64dce4e4 100644
--- a/rbtree-utils.c
+++ b/common/rbtree-utils.c
@@ -16,7 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 
 int rb_insert(struct rb_root *root, struct rb_node *node,
 	      rb_compare_nodes comp)
diff --git a/rbtree-utils.h b/common/rbtree-utils.h
similarity index 100%
rename from rbtree-utils.h
rename to common/rbtree-utils.h
diff --git a/disk-io.c b/disk-io.c
index 31ce9203..8ccce81f 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -32,7 +32,7 @@
 #include "kernel-lib/crc32c.h"
 #include "common/utils.h"
 #include "print-tree.h"
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 
 /* specified errno for check_tree_block */
 #define BTRFS_BAD_BYTENR		(-1)
diff --git a/extent-cache.c b/extent-cache.c
index f458de26..4065522a 100644
--- a/extent-cache.c
+++ b/extent-cache.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include "kerncompat.h"
 #include "extent-cache.h"
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 
 struct cache_extent_search_range {
 	u64 objectid;
diff --git a/mkfs/main.c b/mkfs/main.c
index f4feb4ee..7e131c03 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -39,7 +39,7 @@
 #include "common/utils.h"
 #include "kernel-lib/list_sort.h"
 #include "common/help.h"
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 #include "mkfs/common.h"
 #include "mkfs/rootdir.h"
 #include "kernel-lib/crc32c.h"
diff --git a/qgroup-verify.c b/qgroup-verify.c
index 6e1e7b8b..afe15acf 100644
--- a/qgroup-verify.c
+++ b/qgroup-verify.c
@@ -28,7 +28,7 @@
 #include "print-tree.h"
 #include "common/utils.h"
 #include "kernel-shared/ulist.h"
-#include "rbtree-utils.h"
+#include "common/rbtree-utils.h"
 #include "transaction.h"
 #include "repair.h"