Unnest includes before forthcoming editing.

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>"

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);

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);

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"
 

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>"

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			"+ "

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);

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);

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);

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 */

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);

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"

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);

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>"

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);

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