Revert most part of 200420 as requested, as more review and polish is

needed.

11 files changed, 17 insertions, 0 deletions

diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 124c3b9..0edce34 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -42,6 +42,7 @@ static const char sccsid[] = "@(#)fetch.c	8.1 (Berkeley) 6/6/93";
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
+#include <err.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index acf6b3f..2d5f8e4 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -54,7 +54,9 @@ static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
 
+#include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 #include "systat.h"
 #include "extern.h"
 #include "mode.h"
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index d3573af..90e1578 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -73,6 +73,7 @@ static const char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
 #include <devstat.h>
 #include <err.h>
 #include <nlist.h>
+#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 44ed6ac..0914328 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -55,6 +55,10 @@ static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
+#include <stdlib.h>
+#include <string.h>
+#include <paths.h>
+
 #include "systat.h"
 #include "extern.h"
 #include "mode.h"
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 90c6208..d092f10 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -53,6 +53,7 @@ static const char copyright[] =
 #include <limits.h>
 #include <locale.h>
 #include <nlist.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 9b0d4a8..37be1ef 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 745a283..5f64e3e 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -60,6 +60,8 @@
 
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
+
 #include "systat.h"
 #include "extern.h"
 #include "mode.h"
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index eb469f3..14fc495 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -74,6 +74,7 @@ static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 
 #include <netdb.h>
 #include <nlist.h>
+#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index dca29b5..43df8eb 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -53,6 +53,7 @@ static const char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <err.h>
 
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 4a69a4f..b7f7592 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -57,7 +57,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 
+#include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 6585d93..742e2f7 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -60,6 +60,7 @@ static const char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #include <errno.h>
 #include <langinfo.h>
 #include <nlist.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>