diff --git a/common-defs.h b/common/defs.h
similarity index 100%
rename from common-defs.h
rename to common/defs.h
diff --git a/common/device-scan.c b/common/device-scan.c
index 48dbd9e1..61f8bae7 100644
--- a/common/device-scan.c
+++ b/common/device-scan.c
@@ -31,7 +31,7 @@
 #include "common/device-scan.h"
 #include "common/messages.h"
 #include "common/utils.h"
-#include "common-defs.h"
+#include "common/defs.h"
 #include "ctree.h"
 #include "volumes.h"
 #include "disk-io.h"
diff --git a/common/format-output.c b/common/format-output.c
index 98fb8607..8df93ecb 100644
--- a/common/format-output.c
+++ b/common/format-output.c
@@ -17,7 +17,7 @@
 #include "kerncompat.h"
 #include <stdio.h>
 #include <uuid/uuid.h>
-#include "common-defs.h"
+#include "common/defs.h"
 #include "common/format-output.h"
 #include "common/utils.h"
 #include "cmds/commands.h"
diff --git a/common/utils.h b/common/utils.h
index c31da330..5c1afda9 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -23,7 +23,7 @@
 #include "ctree.h"
 #include <dirent.h>
 #include <stdarg.h>
-#include "common-defs.h"
+#include "common/defs.h"
 #include "common/internal.h"
 #include "btrfs-list.h"
 #include "kernel-lib/sizes.h"
diff --git a/convert/common.h b/convert/common.h
index 2f4ea485..8fafa1a6 100644
--- a/convert/common.h
+++ b/convert/common.h
@@ -23,7 +23,7 @@
 #define __BTRFS_CONVERT_COMMON_H__
 
 #include "kerncompat.h"
-#include "common-defs.h"
+#include "common/defs.h"
 #include "extent-cache.h"
 
 struct btrfs_mkfs_config;
diff --git a/mkfs/common.h b/mkfs/common.h
index 1ca71a4f..426852be 100644
--- a/mkfs/common.h
+++ b/mkfs/common.h
@@ -23,7 +23,7 @@
 #define __BTRFS_MKFS_COMMON_H__
 
 #include "kerncompat.h"
-#include "common-defs.h"
+#include "common/defs.h"
 
 #define BTRFS_MKFS_SYSTEM_GROUP_SIZE SZ_4M
 #define BTRFS_MKFS_SMALL_VOLUME_SIZE SZ_1G