diff --git a/Android.mk b/Android.mk
index 02a5f579..b98d17be 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@ btrfs_shared_libraries := libext2_uuid \
 objects := ctree.c disk-io.c kernel-lib/radix-tree.c extent-tree.c print-tree.c \
           root-tree.c dir-item.c file-item.c inode-item.c inode-map.c \
           common/extent-cache.c extent_io.c volumes.c utils.c repair.c \
-          qgroup.c free-space-cache.c kernel-lib/list_sort.c props.c \
+          qgroup.c kernel-shared/free-space-cache.c kernel-lib/list_sort.c props.c \
           kernel-shared/ulist.c qgroup-verify.c backref.c common/string-table.c task-utils.c \
           inode.c file.c find-root.c free-space-tree.c help.c cmds/receive-dump.c \
           common/fsfeatures.c kernel-lib/tables.c kernel-lib/raid56.c transaction.c
diff --git a/Makefile b/Makefile
index bac96211..adee4bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ libbtrfs_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.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 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-cache.o kernel-shared/root-tree.o volumes.o transaction.o \
 		   kernel-shared/free-space-tree.o repair.o kernel-shared/inode-item.o \
 		   kernel-shared/file-item.o \
 		   kernel-lib/raid56.o kernel-lib/tables.o \
diff --git a/check/main.c b/check/main.c
index bbd9b738..4b37e77b 100644
--- a/check/main.c
+++ b/check/main.c
@@ -35,7 +35,7 @@
 #include "transaction.h"
 #include "common/utils.h"
 #include "cmds/commands.h"
-#include "free-space-cache.h"
+#include "kernel-shared/free-space-cache.h"
 #include "kernel-shared/free-space-tree.h"
 #include "common/rbtree-utils.h"
 #include "kernel-shared/backref.h"
diff --git a/extent-tree.c b/extent-tree.c
index 8e06518e..bd909e69 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -29,7 +29,7 @@
 #include "transaction.h"
 #include "crypto/crc32c.h"
 #include "volumes.h"
-#include "free-space-cache.h"
+#include "kernel-shared/free-space-cache.h"
 #include "kernel-shared/free-space-tree.h"
 #include "common/utils.h"
 
diff --git a/free-space-cache.c b/kernel-shared/free-space-cache.c
similarity index 99%
rename from free-space-cache.c
rename to kernel-shared/free-space-cache.c
index a9e0f8dd..115d341a 100644
--- a/free-space-cache.c
+++ b/kernel-shared/free-space-cache.c
@@ -18,7 +18,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "free-space-cache.h"
+#include "kernel-shared/free-space-cache.h"
 #include "transaction.h"
 #include "disk-io.h"
 #include "extent_io.h"
diff --git a/free-space-cache.h b/kernel-shared/free-space-cache.h
similarity index 100%
rename from free-space-cache.h
rename to kernel-shared/free-space-cache.h
diff --git a/kernel-shared/free-space-tree.c b/kernel-shared/free-space-tree.c
index 5ca23772..bd6a449b 100644
--- a/kernel-shared/free-space-tree.c
+++ b/kernel-shared/free-space-tree.c
@@ -18,7 +18,7 @@
 
 #include "ctree.h"
 #include "disk-io.h"
-#include "free-space-cache.h"
+#include "kernel-shared/free-space-cache.h"
 #include "kernel-shared/free-space-tree.h"
 #include "volumes.h"
 #include "transaction.h"