diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 15f53598b0a0..c6877f60344c 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,18 +37,18 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.87 1999/04/27 11:16:05 phk Exp $
+ * $Id: kern_sysctl.c,v 1.88 1999/04/28 11:37:00 phk Exp $
  */
 
 #include "opt_compat.h"
 
 #include <sys/param.h>
-#include <sys/buf.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/buf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
-#include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 56084aab78eb..880f97221766 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.64 1999/04/07 19:48:09 nsayer Exp $
+ * $Id: kern_time.c,v 1.65 1999/04/27 11:16:07 phk Exp $
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/sysproto.h>
 #include <sys/resourcevar.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 554e182c1239..d2d4365ac956 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.76 1999/06/23 04:44:12 julian Exp $
+ * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $
  */
 
 /*
@@ -43,10 +43,10 @@
  * copy data between mbuf chains and uio lists.
  */
 #include <sys/param.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 554e182c1239..d2d4365ac956 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.76 1999/06/23 04:44:12 julian Exp $
+ * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $
  */
 
 /*
@@ -43,10 +43,10 @@
  * copy data between mbuf chains and uio lists.
  */
 #include <sys/param.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 554e182c1239..d2d4365ac956 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.76 1999/06/23 04:44:12 julian Exp $
+ * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $
  */
 
 /*
@@ -43,10 +43,10 @@
  * copy data between mbuf chains and uio lists.
  */
 #include <sys/param.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 554e182c1239..d2d4365ac956 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.76 1999/06/23 04:44:12 julian Exp $
+ * $Id: nfs_subs.c,v 1.77 1999/06/26 02:46:30 mckusick Exp $
  */
 
 /*
@@ -43,10 +43,10 @@
  * copy data between mbuf chains and uio lists.
  */
 #include <sys/param.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 829258b97a74..2a0dbc8ce87c 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.47 1999/05/06 20:00:34 phk Exp $
+ * $Id: vm_pager.c,v 1.48 1999/06/26 02:46:48 mckusick Exp $
  */
 
 /*
@@ -339,7 +339,8 @@ vm_pager_object_lookup(pg_list, handle)
  */
 
 static void
-initpbuf(struct buf *bp) {
+initpbuf(struct buf *bp)
+{
 	bp->b_rcred = NOCRED;
 	bp->b_wcred = NOCRED;
 	bp->b_qindex = QUEUE_NONE;