diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index a9c8fce3d..e06112ab3 100644
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -15,15 +15,13 @@
 #include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
 #include "lib/device/dev-type.h"
+#include "lib/device/device-types.h"
 #include "lib/mm/xlate.h"
 #include "lib/config/config.h"
 #include "lib/metadata/metadata.h"
 #include "lib/device/bcache.h"
 #include "lib/label/label.h"
 
-#include <libgen.h>
-#include <ctype.h>
-
 #ifdef BLKID_WIPING_SUPPORT
 #include <blkid.h>
 #endif
@@ -33,7 +31,8 @@
 #include "lib/device/dev-ext-udev-constants.h"
 #endif
 
-#include "lib/device/device-types.h"
+#include <libgen.h>
+#include <ctype.h>
 
 struct dev_types *create_dev_types(const char *proc_dir,
 				   const struct dm_config_node *cn)
diff --git a/lib/format_text/export.c b/lib/format_text/export.c
index a9a7e159b..48e4c9afe 100644
--- a/lib/format_text/export.c
+++ b/lib/format_text/export.c
@@ -16,12 +16,12 @@
 #include "base/memory/zalloc.h"
 #include "lib/misc/lib.h"
 #include "import-export.h"
+#include "lvm-version.h"
 #include "lib/metadata/metadata.h"
 #include "lib/display/display.h"
 #include "lib/misc/lvm-string.h"
 #include "lib/metadata/segtype.h"
 #include "lib/format_text/text_export.h"
-#include "lvm-version.h"
 #include "lib/commands/toolcontext.h"
 #include "libdaemon/client/config-util.h"
 
diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 7fba88195..021dacc26 100644
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -14,8 +14,9 @@
  */
 
 #include "lib/misc/lib.h"
-#include "lib/format_text/format-text.h"
 #include "import-export.h"
+#include "format-text.h"
+#include "layout.h"
 #include "lib/device/device.h"
 #include "lib/misc/lvm-file.h"
 #include "lib/config/config.h"
@@ -23,7 +24,6 @@
 #include "lib/commands/toolcontext.h"
 #include "lib/misc/lvm-string.h"
 #include "lib/uuid/uuid.h"
-#include "layout.h"
 #include "lib/misc/crc.h"
 #include "lib/mm/xlate.h"
 #include "lib/label/label.h"