diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 2f9fe667289a..171af5d1617e 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.63 1997/02/22 09:30:06 peter Exp $
+ *	$Id: boot.c,v 1.64 1997/03/12 18:48:31 bde Exp $
  */
 
 
@@ -70,8 +70,8 @@ static char boot_config[BOOT_CONFIG_SIZE];
 char *dflt_name;
 #endif
 char *name;
-char namebuf[NAMEBUF_LEN];
-struct bootinfo bootinfo;
+static char namebuf[NAMEBUF_LEN];
+static struct bootinfo bootinfo;
 int loadflags;
 
 static void getbootdev(char *ptr, int *howto);
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index 8d4bef85a195..b9bd5db34ebe 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id$
+ *	$Id: boot.h,v 1.17 1997/02/22 09:30:07 peter Exp $
  */
 
 #include <sys/param.h>
@@ -71,13 +71,11 @@ void boot2(void);
 /* disk.c */
 int devopen(void);
 void devread(char *iodest, int sector, int cnt);
-char * Bread(int dosdev, int sector);
 
 /* io.c */
 void gateA20(void);
 void printf(const char *format, ...);
 void putchar(int c);
-int getchar(int in_buf);
 void delay1ms(void);
 int gets(char *buf);
 int strcmp(const char *s1, const char *s2);
@@ -96,6 +94,4 @@ void init_serial(void);
 /* sys.c */
 void xread(char *addr, int size);
 void read(char *buffer, int count);
-int find(char *path);
-int block_map(int file_block);
 int openrd(void);
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index e166258752f2..8cd825698b1b 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id$
+ *	$Id: disk.c,v 1.25 1997/02/22 09:30:09 peter Exp $
  */
 
 /*
@@ -52,12 +52,12 @@
 #define	HEADS(di)	((((di)>>8)&0xff)+1)
 
 #ifdef DO_BAD144
-struct dkbad dkb;
-int do_bad144;
+static struct dkbad dkb;
+static int do_bad144;
 #endif DO_BAD144
-int bsize;
+static int bsize;
 
-int spt, spc;
+static int spt, spc;
 
 struct fs *fs;
 struct inode inode;
@@ -76,6 +76,7 @@ static int ra_end;
 static int ra_first;
 
 static int badsect(int sector);
+static char *Bread(int dosdev, int sector);
 
 int
 devopen(void)
@@ -211,7 +212,7 @@ devread(char *iodest, int sector, int cnt)
 }
 
 
-char *
+static char *
 Bread(int dosdev, int sector)
 {
 	if (dosdev != ra_dev || sector < ra_first || sector >= ra_end)
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index 6ba25efce82c..7dfa6aa2919e 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id$
+ *	$Id: io.c,v 1.21 1997/02/22 09:30:10 peter Exp $
  */
 
 #include "boot.h"
@@ -46,6 +46,8 @@
 					   enable clock line */
 
 
+static int getchar(int in_buf);
+
 /*
  * Gate A20 for high memory
  */
@@ -133,7 +135,7 @@ putchar(int c)
 		putc(c);
 }
 
-int
+static int
 getchar(int in_buf)
 {
 	int c;
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 2ad469455d1c..f3e92a1abe36 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -24,28 +24,28 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.18 1997/02/22 09:30:14 peter Exp $
+ *	$Id: sys.c,v 1.19 1997/03/15 16:49:51 bde Exp $
  */
 
 #include "boot.h"
 #include <sys/dirent.h>
 #include <sys/reboot.h>
 
-#ifdef 0
+#if 0
 /* #define BUFSIZE 4096 */
 #define BUFSIZE MAXBSIZE
 
-char buf[BUFSIZE], fsbuf[SBSIZE], iobuf[MAXBSIZE];
+static char buf[BUFSIZE], fsbuf[SBSIZE], iobuf[MAXBSIZE];
 #endif
 
 static char biosdrivedigit;
 
 #define BUFSIZE 8192
 #define MAPBUFSIZE BUFSIZE
-char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
+static char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
 
-char mapbuf[MAPBUFSIZE];
-int mapblock;
+static char mapbuf[MAPBUFSIZE];
+static int mapblock;
 
 int poff;
 
@@ -53,6 +53,9 @@ int poff;
 #define STARTBYTE	8192	/* Where on the media the kernel starts */
 #endif
 
+static int block_map(int file_block);
+static int find(char *path);
+
 void
 xread(char *addr, int size)
 {
@@ -128,9 +131,9 @@ read(char *buffer, int count)
 		bcopy(iobuf, buffer, count);
 	}
 }
-
 #endif
-int
+
+static int
 find(char *path)
 {
 	char *rest, ch;
@@ -178,7 +181,7 @@ find(char *path)
 }
 
 
-int
+static int
 block_map(int file_block)
 {
 	int bnum;