From d376015efed104a8a4417265237117f8042e4de1 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 13 Dec 1995 15:01:13 +0000
Subject: [PATCH] Reduced vm dependencies.  Only `struct vmmeter.h' is
 required. Unfortunately, the sysctl number for reading this struct is bogusly
 placed in <vm/vm_param.h> instead of with the declaration of the struct.

---
 usr.bin/systat/vmstat.c | 5 +++--
 usr.bin/vmstat/vmstat.c | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 8432e155d84..29ffae64f90 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -44,12 +44,13 @@ static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #include <sys/buf.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/user.h>
 #include <sys/proc.h>
+#include <sys/uio.h>
 #include <sys/namei.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
-#include <vm/vm.h>
+
+#include <vm/vm_param.h>
 
 #include <signal.h>
 #include <nlist.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 0c632a2fb64..beaef227b53 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -44,9 +44,9 @@ static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/dkstat.h>
 #include <sys/buf.h>
+#include <sys/uio.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/signal.h>
@@ -54,7 +54,9 @@ static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
-#include <vm/vm.h>
+
+#include <vm/vm_param.h>
+
 #include <time.h>
 #include <nlist.h>
 #include <kvm.h>