diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 988c07219074..bb70261eac48 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swapgeneric.c	5.5 (Berkeley) 5/9/91
- *	$Id: swapgeneric.c,v 1.21 1997/02/22 09:32:49 peter Exp $
+ *	$Id: swapgeneric.c,v 1.22 1997/09/07 12:56:40 bde Exp $
  */
 
 #include <sys/param.h>
@@ -161,7 +161,7 @@ void gets(cp)
 	char *cp;
 {
 	register char *lp;
-	register c;
+	register int c;
 
 	lp = cp;
 	for (;;) {
diff --git a/sys/i386/scsi/bt.c b/sys/i386/scsi/bt.c
index 6f21ccaae2a3..3196dadea189 100644
--- a/sys/i386/scsi/bt.c
+++ b/sys/i386/scsi/bt.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: bt.c,v 1.14 1997/07/20 16:21:36 bde Exp $
+ *      $Id: bt.c,v 1.15 1997/09/21 21:43:54 gibbs Exp $
  */
 
 /*
@@ -324,7 +324,7 @@ bt_cmd(bt, icnt, ocnt, wait, retval, opcode, va_alist)
 	va_list ap;
 	u_char data;
 	u_char		oc;
-	register	i;
+	int		i;
 	int		sts;
 
 	/*
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 526bee3ace6d..57f470a6656f 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id: kern_ktrace.c,v 1.21 1997/11/06 19:29:10 phk Exp $
+ * $Id: kern_ktrace.c,v 1.22 1997/12/05 19:55:38 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -81,7 +81,7 @@ ktrsyscall(vp, code, narg, args)
 {
 	struct	ktr_header *kth;
 	struct	ktr_syscall *ktp;
-	register len = sizeof(struct ktr_syscall) + (narg * sizeof(int));
+	register int len = sizeof(struct ktr_syscall) + (narg * sizeof(int));
 	struct proc *p = curproc;	/* XXX */
 	int 	*argp, i;
 
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index c87355c2cf82..96f822ef0502 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.32 1997/09/21 22:10:49 gibbs Exp $
+ * $Id: ufs_disksubr.c,v 1.33 1997/11/07 08:53:36 phk Exp $
  */
 
 #include <sys/param.h>
@@ -189,7 +189,7 @@ setdisklabel(olp, nlp, openmask)
 	register struct disklabel *olp, *nlp;
 	u_long openmask;
 {
-	register i;
+	register int i;
 	register struct partition *opp, *npp;
 
 	/*
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index d607b47b1e7c..567fd8185468 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- *	$Id: uipc_mbuf.c,v 1.32 1997/10/28 15:58:22 bde Exp $
+ *	$Id: uipc_mbuf.c,v 1.33 1997/12/28 01:01:13 bde Exp $
  */
 
 #include <sys/param.h>
@@ -593,7 +593,7 @@ m_adj(mp, req_len)
 {
 	register int len = req_len;
 	register struct mbuf *m;
-	register count;
+	register int count;
 
 	if ((m = mp) == NULL)
 		return;
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index ef779214939c..c2eed305c622 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.63 1998/02/04 22:33:09 eivind Exp $
+ *	$Id: ip_output.c,v 1.64 1998/02/06 12:13:52 eivind Exp $
  */
 
 #define _IP_VHL
@@ -841,7 +841,7 @@ ip_pcbopts(pcbopt, m)
 	struct mbuf **pcbopt;
 	register struct mbuf *m;
 {
-	register cnt, optlen;
+	register int cnt, optlen;
 	register u_char *cp;
 	u_char opt;
 
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index c5299c61bb85..b63f858ac468 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id: tcp_output.c,v 1.26 1997/09/16 18:36:05 joerg Exp $
+ *	$Id: tcp_output.c,v 1.27 1997/10/07 21:10:06 fenner Exp $
  */
 
 #include "opt_tcpdebug.h"
@@ -737,7 +737,7 @@ void
 tcp_setpersist(tp)
 	register struct tcpcb *tp;
 {
-	register t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
+	register int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
 
 	if (tp->t_timer[TCPT_REXMT])
 		panic("tcp_output REXMT");
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index fc996dfe9e28..3c47d6ec31ce 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -8,7 +8,7 @@
  * file.
  *
  * Written by Julian Elischer (julian@dialix.oz.au)
- *      $Id: scsi_base.c,v 1.52 1997/10/12 08:54:46 joerg Exp $
+ *      $Id: scsi_base.c,v 1.53 1997/12/20 00:28:47 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -1201,7 +1201,7 @@ scsi_4btou(bytes)
 	return rc;
 }
 
-static sc_printing;
+static int sc_printing;
 
 void
 sc_print_init()
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index c87355c2cf82..96f822ef0502 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.32 1997/09/21 22:10:49 gibbs Exp $
+ * $Id: ufs_disksubr.c,v 1.33 1997/11/07 08:53:36 phk Exp $
  */
 
 #include <sys/param.h>
@@ -189,7 +189,7 @@ setdisklabel(olp, nlp, openmask)
 	register struct disklabel *olp, *nlp;
 	u_long openmask;
 {
-	register i;
+	register int i;
 	register struct partition *opp, *npp;
 
 	/*