diff --git a/utils/fatelf-utils.c b/utils/fatelf-utils.c
index f56bdba..659a17d 100644
--- a/utils/fatelf-utils.c
+++ b/utils/fatelf-utils.c
@@ -11,6 +11,10 @@
 #define FATELF_UTILS 1
 #include "fatelf-utils.h"
 
+#include <errno.h>
+#include <unistd.h>
+#include <stdarg.h>
+
 const char *unlink_on_xfail = NULL;
 static uint8_t zerobuf[4096];
 
diff --git a/utils/fatelf-utils.h b/utils/fatelf-utils.h
index a71bf57..3e38c64 100644
--- a/utils/fatelf-utils.h
+++ b/utils/fatelf-utils.h
@@ -11,12 +11,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <stdint.h>
 #include <assert.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>