diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c
index 8cea13039ef2..e1a591a9924c 100644
--- a/usr.bin/mkimg/apm.c
+++ b/usr.bin/mkimg/apm.c
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <apm.h>
 
diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c
index dfaa852440c0..035bbae910f9 100644
--- a/usr.bin/mkimg/bsd.c
+++ b/usr.bin/mkimg/bsd.c
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <bsd.h>
 
diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c
index 7c26a6cf1343..a069982e7aa3 100644
--- a/usr.bin/mkimg/ebr.c
+++ b/usr.bin/mkimg/ebr.c
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <mbr.h>
 
diff --git a/usr.bin/mkimg/endian.h b/usr.bin/mkimg/endian.h
index a8d31208db70..05fa63694bbc 100644
--- a/usr.bin/mkimg/endian.h
+++ b/usr.bin/mkimg/endian.h
@@ -29,6 +29,8 @@
 #ifndef _MKIMG_ENDIAN_H_
 #define _MKIMG_ENDIAN_H_
 
+#include <stdint.h>
+
 static __inline uint16_t
 be16dec(const void *pp)
 {
diff --git a/usr.bin/mkimg/format.c b/usr.bin/mkimg/format.c
index 00139ebc075c..bca61c17ce47 100644
--- a/usr.bin/mkimg/format.c
+++ b/usr.bin/mkimg/format.c
@@ -28,16 +28,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
-#include <err.h>
 #include <errno.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "image.h"
 #include "format.h"
-#include "mkimg.h"
 
 static struct mkimg_format *first;
 static struct mkimg_format *format;
diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c
index 44225ecd3821..a8a9ac999c4e 100644
--- a/usr.bin/mkimg/gpt.c
+++ b/usr.bin/mkimg/gpt.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <gpt.h>
 #include <mbr.h>
diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c
index 16a24eb7b1ba..46767ea96d06 100644
--- a/usr.bin/mkimg/mbr.c
+++ b/usr.bin/mkimg/mbr.c
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <mbr.h>
 
diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c
index fdf2d8cbb141..de4a48169789 100644
--- a/usr.bin/mkimg/qcow.c
+++ b/usr.bin/mkimg/qcow.c
@@ -29,11 +29,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/errno.h>
 #include <assert.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "endian.h"
 #include "image.h"
diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c
index adeb690157a6..f94a0050ca60 100644
--- a/usr.bin/mkimg/raw.c
+++ b/usr.bin/mkimg/raw.c
@@ -28,14 +28,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/errno.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "image.h"
 #include "format.h"
-#include "mkimg.h"
 
 static int
 raw_resize(lba_t imgsz __unused)
diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c
index 3e2ab46df405..c81182837b2e 100644
--- a/usr.bin/mkimg/scheme.c
+++ b/usr.bin/mkimg/scheme.c
@@ -29,10 +29,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
 #include <assert.h>
-#include <err.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.bin/mkimg/uuid.c b/usr.bin/mkimg/uuid.c
index e82135584d86..215e8acb385f 100644
--- a/usr.bin/mkimg/uuid.c
+++ b/usr.bin/mkimg/uuid.c
@@ -28,7 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "endian.h"
diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c
index 31a527a96deb..871873804544 100644
--- a/usr.bin/mkimg/vhd.c
+++ b/usr.bin/mkimg/vhd.c
@@ -28,11 +28,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/errno.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
 
 #include "endian.h"
 #include "image.h"
diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c
index ce0d7b32c81e..eac84d8bae4d 100644
--- a/usr.bin/mkimg/vmdk.c
+++ b/usr.bin/mkimg/vmdk.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "endian.h"
 #include "image.h"
diff --git a/usr.bin/mkimg/vtoc8.c b/usr.bin/mkimg/vtoc8.c
index cf9c4bafb255..b0e0cacfe1e3 100644
--- a/usr.bin/mkimg/vtoc8.c
+++ b/usr.bin/mkimg/vtoc8.c
@@ -30,9 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <vtoc.h>