diff --git a/tools/tools/cfi/Makefile b/tools/tools/cfi/Makefile
index 9e3bbef4110e..34a95b6adb74 100644
--- a/tools/tools/cfi/Makefile
+++ b/tools/tools/cfi/Makefile
@@ -3,5 +3,6 @@
 PROG=	cfi
 BINDIR=	/usr/local/bin
 NO_MAN=
+WARNS?=6
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/cfi/cfi.c b/tools/tools/cfi/cfi.c
index 5b20094f7d8e..e80ac7f3ccea 100644
--- a/tools/tools/cfi/cfi.c
+++ b/tools/tools/cfi/cfi.c
@@ -38,9 +38,12 @@
 #include <sys/ioctl.h>
 #include <sys/cfictl.h>
 
-#include <stdio.h>
+#include <err.h>
 #include <getopt.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 const char *progname;
 const char *dvname;
@@ -48,8 +51,6 @@ const char *dvname;
 static void
 usage(void)
 {
-	int i;
-
 	fprintf(stderr, "usage: %s [-f device] op...\n", progname);
 	fprintf(stderr, "where op's are:\n");
 	fprintf(stderr, "fact\t\tread factory PR segment\n");