3 files changed, 4 insertions, 11 deletions
diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c
index 8028919..8317bd2 100644
--- a/mkfs/mkfs.c
+++ b/mkfs/mkfs.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 #include "mkfs.h"
-#include "util.h"
 
 static int padd_file(int outfd, sqfs_super_t *super, options_t *opt)
 {
diff --git a/mkfs/mkfs.h b/mkfs/mkfs.h
index a743cf7..cea9ebc 100644
--- a/mkfs/mkfs.h
+++ b/mkfs/mkfs.h
@@ -10,14 +10,18 @@
 #include "id_table.h"
 #include "fstree.h"
 #include "config.h"
+#include "util.h"
 
+#include <getopt.h>
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <ctype.h>
 
 typedef struct {
 	unsigned int def_uid;
diff --git a/mkfs/options.c b/mkfs/options.c
index 8ed01ba..e1223ad 100644
--- a/mkfs/options.c
+++ b/mkfs/options.c
@@ -1,15 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 #include "mkfs.h"
-#include "util.h"
-
-#include <stdlib.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <limits.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdio.h>
 
 static struct option long_opts[] = {
 	{ "compressor", required_argument, NULL, 'c' },