diff --git a/Makefile b/Makefile
index d79b5d5c..2ff738cf 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ libbtrfs_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.o
 		   kernel-shared/print-tree.o \
 		   kernel-shared/free-space-cache.o kernel-shared/root-tree.o \
 		   kernel-shared/volumes.o kernel-shared/transaction.o \
-		   kernel-shared/free-space-tree.o repair.o kernel-shared/inode-item.o \
+		   kernel-shared/free-space-tree.o common/repair.o kernel-shared/inode-item.o \
 		   kernel-shared/file-item.o kernel-shared/zoned.o \
 		   kernel-lib/raid56.o kernel-lib/tables.o \
 		   common/device-scan.o common/path-utils.o \
diff --git a/check/main.c b/check/main.c
index 5ad2d211..74590cda 100644
--- a/check/main.c
+++ b/check/main.c
@@ -28,7 +28,7 @@
 #include <time.h>
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/volumes.h"
-#include "repair.h"
+#include "common/repair.h"
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/task-utils.h"
diff --git a/check/mode-common.c b/check/mode-common.c
index ef77b060..cb22f323 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -21,7 +21,7 @@
 #include "kernel-shared/transaction.h"
 #include "common/utils.h"
 #include "kernel-shared/disk-io.h"
-#include "repair.h"
+#include "common/repair.h"
 #include "check/mode-common.h"
 
 /*
diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 2531fde8..2f736712 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -16,7 +16,7 @@
 
 #include <time.h>
 #include "kernel-shared/ctree.h"
-#include "repair.h"
+#include "common/repair.h"
 #include "kernel-shared/transaction.h"
 #include "common/messages.h"
 #include "kernel-shared/disk-io.h"
diff --git a/check/qgroup-verify.c b/check/qgroup-verify.c
index 6a1e6847..14645c85 100644
--- a/check/qgroup-verify.c
+++ b/check/qgroup-verify.c
@@ -30,7 +30,7 @@
 #include "kernel-shared/ulist.h"
 #include "common/rbtree-utils.h"
 #include "kernel-shared/transaction.h"
-#include "repair.h"
+#include "common/repair.h"
 
 #include "qgroup-verify.h"
 
diff --git a/repair.c b/common/repair.c
similarity index 98%
rename from repair.c
rename to common/repair.c
index b84bcb2e..6eed7cec 100644
--- a/repair.c
+++ b/common/repair.c
@@ -19,7 +19,7 @@
 #include "kernel-shared/ctree.h"
 #include "common/extent-cache.h"
 #include "common/utils.h"
-#include "repair.h"
+#include "common/repair.h"
 
 int repair = 0;
 
diff --git a/repair.h b/common/repair.h
similarity index 100%
rename from repair.h
rename to common/repair.h
diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c
index 3a82286c..62c206a4 100644
--- a/kernel-shared/ctree.c
+++ b/kernel-shared/ctree.c
@@ -19,7 +19,7 @@
 #include "kernel-shared/disk-io.h"
 #include "kernel-shared/transaction.h"
 #include "kernel-shared/print-tree.h"
-#include "repair.h"
+#include "common/repair.h"
 #include "common/internal.h"
 #include "common/messages.h"
 #include "common/utils.h"