diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index e612974c44a..8af5c1a5fbd 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.c,v 1.9 1998/10/29 17:41:34 gibbs Exp $
+ *      $Id: advlib.c,v 1.10 1998/12/07 21:58:15 archie Exp $
  */
 /*
  * Ported from:
@@ -122,7 +122,7 @@ static struct adv_quirk_entry adv_quirk_table[] =
 /*
  * Allowable periods in ns
  */
-u_int8_t adv_sdtr_period_tbl[] =
+static u_int8_t adv_sdtr_period_tbl[] =
 {
 	25,
 	30,
@@ -134,7 +134,7 @@ u_int8_t adv_sdtr_period_tbl[] =
 	85
 };
 
-u_int8_t adv_sdtr_period_tbl_ultra[] =
+static u_int8_t adv_sdtr_period_tbl_ultra[] =
 {
 	12,
 	19,
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 20c42399d2f..8ab5a855ac8 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aha.c,v 1.19 1999/01/20 06:21:26 imp Exp $
+ *      $Id: aha.c,v 1.20 1999/03/02 20:56:07 imp Exp $
  */
 
 #include "pnp.h"
@@ -185,7 +185,7 @@ u_long aha_unit = 0;
  * manager can do it for us.  This ensures that we don't
  * reprobe a card already found by the EISA or PCI probes.
  */
-struct aha_isa_port aha_isa_ports[] =
+static struct aha_isa_port aha_isa_ports[] =
 {
 	{ 0x130, 0, 4 },
 	{ 0x134, 0, 5 },
@@ -199,7 +199,7 @@ struct aha_isa_port aha_isa_ports[] =
  * I/O ports listed in the order enumerated by the
  * card for certain op codes.
  */
-u_int16_t aha_board_ports[] =
+static u_int16_t aha_board_ports[] =
 {
 	0x330,
 	0x334,
@@ -1841,7 +1841,7 @@ ahapoll(struct cam_sim *sim)
 	aha_intr(cam_sim_softc(sim));
 }
 
-void
+static void
 ahatimeout(void *arg)
 {
 	struct aha_ccb	*accb;
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index e869f643667..d462c4ffa78 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -964,7 +964,7 @@ struct en_softc *sc;
  * en_dmaprobe_doit: do actual testing
  */
 
-int
+static int
 en_dmaprobe_doit(sc, sp, dp, wmtry)
 
 struct en_softc *sc;
@@ -3284,7 +3284,7 @@ done:
 
 #define END_BITS "\20\7SWSL\6DRQ\5DTQ\4RX\3TX\2MREGS\1STATS"
 
-int en_dump(unit, level)
+static int en_dump(unit, level)
 
 int unit, level;
 
@@ -3451,7 +3451,7 @@ int unit, level;
  * en_dumpmem: dump the memory
  */
 
-int en_dumpmem(unit, addr, len)
+static int en_dumpmem(unit, addr, len)
 
 int unit, addr, len;
 
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 71d2eb9128c..29f3a1d38ed 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_buffer.c,v 1.2 1998/10/31 20:06:45 phk Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+__RCSID("@(#) $Id: eni_buffer.c,v 1.2 1998/10/31 20:06:45 phk Exp $");
 #endif
 
 static int	eni_test_memory __P((Eni_unit *));
@@ -64,7 +64,7 @@ static int	eni_test_memory __P((Eni_unit *));
  * the Efficient adapter with different memory sizes, this allows
  * us to fool an adapter with more memory into thinking it has less.
  */
-int	eni_mem_max = MAX_ENI_MEM;	/* Default to all available memory */
+static int	eni_mem_max = MAX_ENI_MEM;	/* Default to all available memory */
 
 /*
  * Size and test adapter RAM
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index cf9f6ba5ac2..12174a26e59 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.c,v 1.6 1998/12/07 21:58:16 archie Exp $
+ *	$Id: iicbus.c,v 1.7 1999/01/09 18:08:24 nsouch Exp $
  *
  */
 
@@ -76,7 +76,7 @@ struct iicbus_device {
  *
  * XXX only one smb driver should exist for each I2C interface
  */
-struct iicbus_device iicbus_children[] = {
+static struct iicbus_device iicbus_children[] = {
 	{ "iicsmb", IICBUS_DRIVER_CLASS, "I2C to SMB bridge" },
 	{ "iic", IICBUS_DRIVER_CLASS, "I2C general purpose I/O" },
 #if 0
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 01ac663a225..a11260ec5c2 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.12 1999/01/11 21:22:41 nsouch Exp $
+ *	$Id: ppbconf.c,v 1.13 1999/01/14 06:22:02 jdp Exp $
  *
  */
 #include <sys/param.h>
@@ -39,7 +39,7 @@
 
 #include "opt_ppb_1284.h"
 
-LIST_HEAD(, ppb_data)	ppbdata;	/* list of existing ppbus */
+static LIST_HEAD(, ppb_data)	ppbdata;	/* list of existing ppbus */
 
 /*
  * Add a null driver so that the linker set always exists.