re-order includes and eliminate duplicates, no binary change; ok henning@

2 files changed, 23 insertions, 32 deletions

diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index a5e18f1250c..5381af8353d 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.49 2006/08/29 03:55:09 deraadt Exp $	*/
+/*	$OpenBSD: dhcpd.h,v 1.50 2006/11/21 00:10:06 stevesk Exp $	*/
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -40,7 +40,6 @@
  */
 
 #include <sys/types.h>
-
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/stat.h>
@@ -61,7 +60,6 @@
 #include <limits.h>
 #include <netdb.h>
 #include <paths.h>
-#include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h
index e1196b0f29d..6a6c0f1db9e 100644
--- a/usr.sbin/dhcpd/dhcpd.h
+++ b/usr.sbin/dhcpd/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.22 2006/11/20 19:14:23 stevesk Exp $ */
+/*	$OpenBSD: dhcpd.h,v 1.23 2006/11/21 00:10:06 stevesk Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999
@@ -39,44 +39,40 @@
  */
 
 #include <sys/types.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/sockio.h>
+#include <sys/time.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+
+#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netdb.h>
+
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
+#include <netdb.h>
+#include <paths.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <time.h>
-
-#include <syslog.h>
-#include <sys/types.h>
 #include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <syslog.h>
+#include <time.h>
 #include <unistd.h>
-#include <setjmp.h>
-#include <limits.h>
-
-#include <sys/wait.h>
-#include <signal.h>
 
 extern int h_errno;
 
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <sys/sockio.h>
-
 #define ifr_netmask ifr_addr
 
-#include <stdarg.h>
-
 #ifndef _PATH_DHCPD_PID
 #define _PATH_DHCPD_PID	"/var/run/dhcpd.pid"
 #endif
@@ -88,9 +84,6 @@ extern int h_errno;
 #define _PATH_DEV_PF "/dev/pf"
 #endif
 
-/* Time stuff... */
-#include <sys/time.h>
-
 #define HAVE_SA_LEN
 #define HAVE_MKSTEMP