diff --git a/bin/ps/print.c b/bin/ps/print.c
index 9b2951fd9500..f3a1bf651fd7 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.55 2000/06/08 13:30:40 simonb Exp $	*/
+/*	$NetBSD: print.c,v 1.56 2000/06/29 06:27:33 mrg Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #else
-__RCSID("$NetBSD: print.c,v 1.55 2000/06/08 13:30:40 simonb Exp $");
+__RCSID("$NetBSD: print.c,v 1.56 2000/06/29 06:27:33 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -86,8 +86,6 @@ __RCSID("$NetBSD: print.c,v 1.55 2000/06/08 13:30:40 simonb Exp $");
 #include <sys/ucred.h>
 #include <sys/sysctl.h>
 
-#include <vm/vm.h>
-
 #include <err.h>
 #include <kvm.h>
 #include <math.h>
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index ba41e78f10ee..b058557a244c 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rstat_proc.c,v 1.34 2000/06/04 01:38:52 perry Exp $	*/
+/*	$NetBSD: rstat_proc.c,v 1.35 2000/06/29 06:26:33 mrg Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
 static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";
 static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: rstat_proc.c,v 1.34 2000/06/04 01:38:52 perry Exp $");
+__RCSID("$NetBSD: rstat_proc.c,v 1.35 2000/06/29 06:26:33 mrg Exp $");
 #endif
 #endif
 
@@ -61,7 +61,6 @@ __RCSID("$NetBSD: rstat_proc.c,v 1.34 2000/06/04 01:38:52 perry Exp $");
 #include <syslog.h>
 #ifdef BSD
 #include <sys/sysctl.h>
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/dkstat.h>
 #include "dkstats.h"
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 43e4f21b826c..5cdc4013a760 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmstat.c,v 1.31 2000/06/05 21:36:34 mycroft Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.32 2000/06/29 06:29:16 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1989, 1992, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-__RCSID("$NetBSD: vmstat.c,v 1.31 2000/06/05 21:36:34 mycroft Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.32 2000/06/29 06:29:16 mrg Exp $");
 #endif /* not lint */
 
 /*
@@ -56,8 +56,6 @@ __RCSID("$NetBSD: vmstat.c,v 1.31 2000/06/05 21:36:34 mycroft Exp $");
 #include <sys/sched.h>
 #include <sys/sysctl.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <ctype.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index b8a6d4b49090..7ae910cb5656 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.66 2000/06/04 19:15:21 cgd Exp $ */
+/* $NetBSD: vmstat.c,v 1.67 2000/06/29 06:29:14 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.66 2000/06/04 19:15:21 cgd Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.67 2000/06/29 06:29:14 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,10 @@ __RCSID("$NetBSD: vmstat.c,v 1.66 2000/06/04 19:15:21 cgd Exp $");
 #include <sys/sysctl.h>
 #include <sys/device.h>
 #include <sys/pool.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_stat.h>
+
 #include <err.h>
 #include <fcntl.h>
 #include <time.h>
@@ -116,8 +119,6 @@ __RCSID("$NetBSD: vmstat.c,v 1.66 2000/06/04 19:15:21 cgd Exp $");
 #include <limits.h>
 #include "dkstats.h"
 
-#include <uvm/uvm_stat.h>
-
 struct nlist namelist[] = {
 #define	X_BOOTTIME	0
 	{ "_boottime" },