From f41f949d09ee73fda2c37b2f638a776a0e3bbdef Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@FreeBSD.org>
Date: Sat, 23 Oct 1999 17:45:11 +0000
Subject: [PATCH]     Cleanup missing includes, stale includes, and a few
 printf format     inconsistancies.

---
 usr.bin/netstat/if.c       | 2 +-
 usr.bin/netstat/netgraph.c | 1 -
 usr.bin/netstat/route.c    | 2 +-
 usr.sbin/ngctl/ngctl.h     | 2 +-
 usr.sbin/nghook/main.c     | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 32a8eaad5b33..e1592ba07a46 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -98,7 +98,7 @@ bdg_stats(u_long dummy, char *name) /* print bridge statistics */
 "Name          In      Out  Forward     Drop    Bcast    Mcast    Local  Unknown\n");
     for (i = 0 ; i < 16 ; i++) {
 	if (s.s[i].name[0])
-	printf("%-6s %9d%9d%9d%9d%9d%9d%9d%9d\n",
+	printf("%-6s %9ld%9ld%9ld%9ld%9ld%9ld%9ld%9ld\n",
 	  s.s[i].name,
 	  s.s[i].p_in[(int)BDG_IN],
 	  s.s[i].p_in[(int)BDG_OUT],
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 33bc7799f440..e43fb7bba1c1 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -57,7 +57,6 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <netgraph.h>
 #include <err.h>
 #include "netstat.h"
 
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 158b3ff1cdf3..0cdbdf8c7f44 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -539,7 +539,7 @@ p_rtentry(rt)
 	p_sockaddr(&addr.u_sa, &mask.u_sa, rt->rt_flags, WID_DST);
 	p_sockaddr(kgetsa(rt->rt_gateway), NULL, RTF_HOST, WID_GW);
 	p_flags(rt->rt_flags, "%-6.6s ");
-	printf("%6d %8ld ", rt->rt_refcnt, rt->rt_use);
+	printf("%6ld %8ld ", rt->rt_refcnt, rt->rt_use);
 	if (rt->rt_ifp) {
 		if (rt->rt_ifp != lastif) {
 			kget(rt->rt_ifp, ifnet);
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index b0fce2387651..3f684220bd53 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -52,8 +52,8 @@
 #include <errno.h>
 #include <err.h>
 
-#include <netgraph.h>
 #include <netgraph/ng_socket.h>
+#include <netgraph/ng_message.h>
 
 /* Command descriptors */
 struct ngcmd {
diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c
index ce29d9d0e368..1244b023baaa 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/main.c
@@ -51,7 +51,7 @@
 #include <sys/socket.h>
 #include <sys/select.h>
 
-#include <netgraph.h>
+#include <netgraph/ng_message.h>
 
 #define DEFAULT_HOOKNAME	"debug"
 #define NG_SOCK_HOOK_NAME	"hook"