diff --git a/Makefile b/Makefile
index 07a20b61..63d337cc 100644
--- a/Makefile
+++ b/Makefile
@@ -613,21 +613,21 @@ tags: FORCE
 	@echo "    [TAGS]   $(TAGS_CMD)"
 	$(Q)$(TAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] \
 		check/*.[ch] kernel-lib/*.[ch] kernel-shared/*.[ch] \
-		cmds/*.[ch] \
+		cmds/*.[ch] common/*.[ch] \
 		libbtrfsutil/*.[ch]
 
 etags: FORCE
 	@echo "    [ETAGS]   $(ETAGS_CMD)"
 	$(Q)$(ETAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] \
 		check/*.[ch] kernel-lib/*.[ch] kernel-shared/*.[ch] \
-		cmds/*.[ch] \
+		cmds/*.[ch] common/*.[ch] \
 		libbtrfsutil/*.[ch]
 
 cscope: FORCE
 	@echo "    [CSCOPE] $(CSCOPE_CMD)"
 	$(Q)ls -1 *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] check/*.[ch] \
 		kernel-lib/*.[ch] kernel-shared/*.[ch] libbtrfsutil/*.[ch] \
-		cmds/*.[ch] \
+		cmds/*.[ch] common/*.[ch] \
 		> cscope.files
 	$(Q)$(CSCOPE_CMD)
 
@@ -641,7 +641,7 @@ clean: $(CLEANDIRS)
 		image/*.o image/*.o.d \
 		convert/*.o convert/*.o.d \
 		mkfs/*.o mkfs/*.o.d check/*.o check/*.o.d \
-		cmds/*.o cmds/*.o.d \
+		cmds/*.o cmds/*.o.d common/*.o common/*.o.d \
 	      ioctl-test quick-test library-test library-test-static \
               mktables btrfs.static mkfs.btrfs.static fssum \
 	      $(check_defs) \
diff --git a/backref.c b/backref.c
index 23a394ed..1b826d48 100644
--- a/backref.c
+++ b/backref.c
@@ -22,7 +22,7 @@
 #include "backref.h"
 #include "kernel-shared/ulist.h"
 #include "transaction.h"
-#include "internal.h"
+#include "common/internal.h"
 
 #define pr_debug(...) do { } while (0)
 
diff --git a/check/mode-common.c b/check/mode-common.c
index 95dc32d8..657859c3 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -16,7 +16,7 @@
 
 #include <time.h>
 #include "ctree.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "messages.h"
 #include "transaction.h"
 #include "utils.h"
diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 92b497e0..317651c6 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -22,7 +22,7 @@
 #include "disk-io.h"
 #include "backref.h"
 #include "hash.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "utils.h"
 #include "volumes.h"
 #include "check/mode-common.h"
diff --git a/internal.h b/common/internal.h
similarity index 100%
rename from internal.h
rename to common/internal.h
diff --git a/convert/source-fs.c b/convert/source-fs.c
index 5660a22c..b11188e4 100644
--- a/convert/source-fs.c
+++ b/convert/source-fs.c
@@ -16,7 +16,7 @@
 
 #include "kerncompat.h"
 #include <unistd.h>
-#include "internal.h"
+#include "common/internal.h"
 #include "disk-io.h"
 #include "volumes.h"
 #include "convert/common.h"
diff --git a/ctree.c b/ctree.c
index 30ab02f9..25de2ce9 100644
--- a/ctree.c
+++ b/ctree.c
@@ -20,7 +20,7 @@
 #include "transaction.h"
 #include "print-tree.h"
 #include "repair.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "sizes.h"
 #include "messages.h"
 #include "volumes.h"
diff --git a/extent_io.c b/extent_io.c
index a9ceff51..9f706fd4 100644
--- a/extent_io.c
+++ b/extent_io.c
@@ -29,7 +29,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "utils.h"
-#include "internal.h"
+#include "common/internal.h"
 
 void extent_io_tree_init(struct extent_io_tree *tree)
 {
diff --git a/file-item.c b/file-item.c
index 71d4e89f..427196a9 100644
--- a/file-item.c
+++ b/file-item.c
@@ -25,7 +25,7 @@
 #include "transaction.h"
 #include "print-tree.h"
 #include "crc32c.h"
-#include "internal.h"
+#include "common/internal.h"
 
 #define MAX_CSUM_ITEMS(r, size) ((((BTRFS_LEAF_DATA_SIZE(r->fs_info) - \
 			       sizeof(struct btrfs_item) * 2) / \
diff --git a/free-space-cache.c b/free-space-cache.c
index 2ef2d307..2ba2b659 100644
--- a/free-space-cache.c
+++ b/free-space-cache.c
@@ -24,7 +24,7 @@
 #include "extent_io.h"
 #include "crc32c.h"
 #include "bitops.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "utils.h"
 
 /*
diff --git a/free-space-tree.c b/free-space-tree.c
index c854768b..46b03f3b 100644
--- a/free-space-tree.c
+++ b/free-space-tree.c
@@ -23,7 +23,7 @@
 #include "volumes.h"
 #include "transaction.h"
 #include "bitops.h"
-#include "internal.h"
+#include "common/internal.h"
 
 static struct btrfs_free_space_info *
 search_free_space_info(struct btrfs_trans_handle *trans,
diff --git a/image/sanitize.c b/image/sanitize.c
index e00c8b35..f6d12bad 100644
--- a/image/sanitize.c
+++ b/image/sanitize.c
@@ -15,7 +15,7 @@
  */
 
 #include "kerncompat.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "messages.h"
 #include "utils.h"
 #include "kernel-lib/crc32c.h"
diff --git a/inode-map.c b/inode-map.c
index 9000e69b..36d27c3f 100644
--- a/inode-map.c
+++ b/inode-map.c
@@ -19,7 +19,7 @@
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
-#include "internal.h"
+#include "common/internal.h"
 
 /*
  * walks the btree of allocated inodes and find a hole.
diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h
index 2c51a265..0acb8e6f 100644
--- a/kernel-lib/bitops.h
+++ b/kernel-lib/bitops.h
@@ -3,7 +3,7 @@
 
 #include <linux/kernel.h>
 #include <endian.h>
-#include "internal.h"
+#include "common/internal.h"
 
 #ifndef DIV_ROUND_UP
 #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index 356467be..ba5824f3 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -27,7 +27,7 @@
 #include <ftw.h>
 #include "ctree.h"
 #include "volumes.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "disk-io.h"
 #include "messages.h"
 #include "transaction.h"
diff --git a/utils.h b/utils.h
index 2a7dd63e..4aea6135 100644
--- a/utils.h
+++ b/utils.h
@@ -24,7 +24,7 @@
 #include <dirent.h>
 #include <stdarg.h>
 #include "common-defs.h"
-#include "internal.h"
+#include "common/internal.h"
 #include "btrfs-list.h"
 #include "sizes.h"
 #include "messages.h"