diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 83491194bb03..9a460be9fe6b 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -162,6 +162,7 @@ static cd9660node *cd9660_create_directory(iso9660_disk *, const char *,
     cd9660node *, cd9660node *);
 static cd9660node *cd9660_create_special_directory(iso9660_disk *, u_char,
     cd9660node *);
+static int  cd9660_add_generic_bootimage(iso9660_disk *, const char *);
 
 
 /*
@@ -2159,7 +2160,7 @@ cd9660_create_special_directory(iso9660_disk *diskStructure, u_char type,
 	return temp;
 }
 
-int
+static int
 cd9660_add_generic_bootimage(iso9660_disk *diskStructure, const char *bootimage)
 {
 	struct stat stbuf;
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index dac87d6724eb..e9b6b3c7ddeb 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -322,7 +322,6 @@ void			cd9660_time_915(unsigned char *, time_t);
 
 /*** Boot Functions ***/
 int	cd9660_write_generic_bootimage(FILE *);
-int	cd9660_add_generic_bootimage(iso9660_disk *, const char *);
 int	cd9660_write_boot(iso9660_disk *, FILE *);
 int	cd9660_add_boot_disk(iso9660_disk *, const char *);
 int	cd9660_eltorito_add_boot_option(iso9660_disk *, const char *,
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index e947d03430e3..300ba97b3cc3 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -84,7 +84,6 @@ struct stat stampst;
 static	fstype_t *get_fstype(const char *);
 static int get_tstamp(const char *, struct stat *);
 static	void	usage(fstype_t *, fsinfo_t *);
-int		main(int, char *[]);
 
 int
 main(int argc, char *argv[])
diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h
index b3bcb0bac86f..1d4f9897d1fd 100644
--- a/usr.sbin/makefs/makefs.h
+++ b/usr.sbin/makefs/makefs.h
@@ -186,7 +186,7 @@ DECLARE_FUN(cd9660);
 extern	u_int		debug;
 extern	int		dupsok;
 extern	struct timespec	start_time;
-extern struct stat stampst;
+extern	struct stat stampst;
 
 /*
  * If -x is specified, we want to exclude nodes which do not appear
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index a1b0cd9d9282..254ec6088d6a 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -40,6 +40,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 
 #include <assert.h>
@@ -50,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include "makefs.h"
 #include "mtree.h"