16 files changed, 95 insertions, 20 deletions

diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c
index 9b4c2b7b9414..edd47d10f7cf 100644
--- a/usr.sbin/ngctl/config.c
+++ b/usr.sbin/ngctl/config.c
@@ -36,6 +36,13 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <errno.h>
+#include <netgraph.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
 #include "ngctl.h"
 
 #define NOCONFIG	"<no config>"
diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c
index 460e6b26e334..a9e16f1b298f 100644
--- a/usr.sbin/ngctl/connect.c
+++ b/usr.sbin/ngctl/connect.c
@@ -37,6 +37,10 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+
 #include "ngctl.h"
 
 static int ConnectCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c
index fbfce4ee628b..4fa074d96044 100644
--- a/usr.sbin/ngctl/debug.c
+++ b/usr.sbin/ngctl/debug.c
@@ -37,6 +37,11 @@
  * $FreeBSD$
  */
 
+#include <netgraph.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "ngctl.h"
 
 static int DebugCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/dot.c b/usr.sbin/ngctl/dot.c
index d5a43f5441ed..4b4fc768348b 100644
--- a/usr.sbin/ngctl/dot.c
+++ b/usr.sbin/ngctl/dot.c
@@ -38,7 +38,12 @@
  * $FreeBSD$
  */
 
+#include <err.h>
 #include <inttypes.h>
+#include <netgraph.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "ngctl.h"
 
diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c
index 6d3cc4f406c3..7f12434a9f17 100644
--- a/usr.sbin/ngctl/list.c
+++ b/usr.sbin/ngctl/list.c
@@ -37,6 +37,12 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "ngctl.h"
 
 #define UNNAMED		"<unnamed>"
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index fcd61dfd9ab5..ecf4caba9b04 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -38,6 +38,22 @@
  * $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
  */
 
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include <netgraph.h>
+
 #include "ngctl.h"
 
 #define PROMPT			"+ "
diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c
index 621d318ecf40..083a6277576f 100644
--- a/usr.sbin/ngctl/mkpeer.c
+++ b/usr.sbin/ngctl/mkpeer.c
@@ -37,6 +37,10 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+
 #include "ngctl.h"
 
 static int MkPeerCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index c71815b5a423..fa5ae29e07c4 100644
--- a/usr.sbin/ngctl/msg.c
+++ b/usr.sbin/ngctl/msg.c
@@ -38,6 +38,14 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
 #include "ngctl.h"
 
 static int MsgCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c
index 3de136034785..92736a72c4bb 100644
--- a/usr.sbin/ngctl/name.c
+++ b/usr.sbin/ngctl/name.c
@@ -37,6 +37,11 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <netgraph.h>
+
 #include "ngctl.h"
 
 static int NameCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index 1f7826e32a87..4d8c2adb7691 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -37,26 +37,6 @@
  * $FreeBSD$
  */
 
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sysexits.h>
-#include <limits.h>
-#include <ctype.h>
-#include <errno.h>
-#include <err.h>
-
-#include <netgraph.h>
-#include <netgraph/ng_socket.h>
-#include <netgraph/ng_message.h>
-
 #define MAX_CMD_ALIAS	8
 
 /* Command descriptors */
diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c
index 834cc0c909d9..ba63a9efac14 100644
--- a/usr.sbin/ngctl/rmhook.c
+++ b/usr.sbin/ngctl/rmhook.c
@@ -37,6 +37,10 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+
 #include "ngctl.h"
 
 static int RmHookCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c
index 6921ec45f7aa..e60830a97ef2 100644
--- a/usr.sbin/ngctl/show.c
+++ b/usr.sbin/ngctl/show.c
@@ -37,6 +37,12 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "ngctl.h"
 
 #define FMT		"  %-15s %-15s %-12s %-15s %-15s\n"
diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c
index d391ba801e58..e5679dda7b0e 100644
--- a/usr.sbin/ngctl/shutdown.c
+++ b/usr.sbin/ngctl/shutdown.c
@@ -37,6 +37,10 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <unistd.h>
+
 #include "ngctl.h"
 
 static int ShutdownCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c
index 8c10a854afb8..a6c6552fca2a 100644
--- a/usr.sbin/ngctl/status.c
+++ b/usr.sbin/ngctl/status.c
@@ -37,6 +37,11 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <errno.h>
+#include <netgraph.h>
+#include <stdio.h>
+
 #include "ngctl.h"
 
 #define NOSTATUS	"<no status>"
diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c
index 30c5c168c6ca..8ed151e06523 100644
--- a/usr.sbin/ngctl/types.c
+++ b/usr.sbin/ngctl/types.c
@@ -37,6 +37,12 @@
  * $FreeBSD$
  */
 
+#include <err.h>
+#include <netgraph.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "ngctl.h"
 
 static int TypesCmd(int ac, char **av);
diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c
index d1bdca09427e..288edf6600a3 100644
--- a/usr.sbin/ngctl/write.c
+++ b/usr.sbin/ngctl/write.c
@@ -33,6 +33,16 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <netgraph/ng_socket.h>
+
 #include "ngctl.h"
 
 #define BUF_SIZE	8192