diff --git a/Makefile b/Makefile
index 4fb99599..400151c5 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,8 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
 	  root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
 	  extent-cache.o extent_io.o volumes.o utils.o repair.o \
 	  qgroup.o free-space-cache.o kernel-lib/list_sort.o props.o \
-	  kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o task-utils.o \
+	  kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o \
+	  common/task-utils.o \
 	  inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \
 	  fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o \
 	  delayed-ref.o
diff --git a/check/main.c b/check/main.c
index 24e73ffa..581f1384 100644
--- a/check/main.c
+++ b/check/main.c
@@ -31,7 +31,7 @@
 #include "repair.h"
 #include "disk-io.h"
 #include "print-tree.h"
-#include "task-utils.h"
+#include "common/task-utils.h"
 #include "transaction.h"
 #include "utils.h"
 #include "commands.h"
diff --git a/task-utils.c b/common/task-utils.c
similarity index 98%
rename from task-utils.c
rename to common/task-utils.c
index e4dcd36b..8d2034ad 100644
--- a/task-utils.c
+++ b/common/task-utils.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "task-utils.h"
+#include "common/task-utils.h"
 
 struct task_info *task_init(void *(*threadfn)(void *), int (*postfn)(void *),
 			    void *thread_private)
diff --git a/task-utils.h b/common/task-utils.h
similarity index 100%
rename from task-utils.h
rename to common/task-utils.h
diff --git a/convert/main.c b/convert/main.c
index 01090b98..313e84db 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -96,7 +96,7 @@
 #include "volumes.h"
 #include "transaction.h"
 #include "utils.h"
-#include "task-utils.h"
+#include "common/task-utils.h"
 #include "help.h"
 #include "mkfs/common.h"
 #include "convert/common.h"