Remove superfluous includes and follow style(9).

ok claudio@ benno@

control.c

@@ -19,17 +19,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/un.h>
+
 #include <errno.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
-#include "log.h"
 #include "control.h"
+#include "log.h"
 
 #define	CONTROL_BACKLOG	5
 

control.h

@@ -20,7 +20,7 @@
 #define	_CONTROL_H_
 
 #include <sys/queue.h>
-#include <sys/time.h>
+
 #include <event.h>
 
 struct {

eigrp.h

@@ -21,9 +21,6 @@
 #ifndef _EIGRP_H_
 #define _EIGRP_H_
 
-#include <netinet/in.h>
-#include <stddef.h>
-
 /* misc */
 #define EIGRP_VERSION		2
 #define IPPROTO_EIGRP		88

eigrpd.c

@@ -19,24 +19,23 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/sysctl.h>
-#include <arpa/inet.h>
+
 #include <err.h>
 #include <errno.h>
 #include <pwd.h>
-#include <string.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
-#include "control.h"
-#include "log.h"
 #include "rde.h"
+#include "log.h"
 
 void		main_sig_handler(int, short, void *);
 __dead void	usage(void);

eigrpd.h

@@ -22,15 +22,14 @@
 #define _EIGRPD_H_
 
 #include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/tree.h>
-#include <net/route.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <event.h>
 
+#include <event.h>
 #include <imsg.h>
+
 #include "eigrp.h"
 
 #define CONF_FILE		"/etc/eigrpd.conf"

eigrpe.c

@@ -19,21 +19,23 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
 #include <arpa/inet.h>
+#include <errno.h>
+#include <pwd.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <pwd.h>
 #include <unistd.h>
-#include <errno.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
 #include "rde.h"
-#include "control.h"
 #include "log.h"
+#include "control.h"
 
 void		 eigrpe_sig_handler(int, short, void *);
 __dead void	 eigrpe_shutdown(void);

eigrpe.h

@@ -20,10 +20,10 @@
 #ifndef _EIGRPE_H_
 #define _EIGRPE_H_
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
+#include <sys/queue.h>
+#include <sys/tree.h>
+
+#include <event.h>
 
 TAILQ_HEAD(ctl_conns, ctl_conn)	ctl_conns;
 

hello.c

@@ -16,13 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <string.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
 #include <arpa/inet.h>
+#include <string.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 /* hello packet handling */
 

interface.c

@@ -18,18 +18,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
+#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <arpa/inet.h>
+
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf        *econf;
 

kroute.c

@@ -21,21 +21,16 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
-#include <sys/tree.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_types.h>
 #include <net/route.h>
+#include <netinet/in.h>
+
+#include <arpa/inet.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include "eigrpd.h"
 #include "log.h"

log.c

@@ -16,15 +16,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+
+#include <arpa/inet.h>
 #include <errno.h>
+#include <netdb.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "eigrpd.h"
 #include "rde.h"

neighbor.c

@@ -16,13 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
+
 #include <string.h>
+#include <stdlib.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
 #include "eigrpe.h"
 #include "rde.h"
 #include "log.h"

packet.c

@@ -17,17 +17,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
 #include <net/if_dl.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+
+#include <arpa/inet.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf	*econf;
 

parse.y

@@ -26,20 +26,17 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <netinet/in.h>
+#include <net/route.h>
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
-#include <unistd.h>
 #include <ifaddrs.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
 #include "log.h"

printconf.c

@@ -16,12 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdio.h>
+#include <sys/types.h>
+
 #include <arpa/inet.h>
+#include <stdio.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
-#include "eigrpe.h"
 #include "log.h"
 
 void	print_mainconf(struct eigrpd_conf *);

query.c

@@ -16,14 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/ip6.h>
 
+#include <stdlib.h>
+
 #include "eigrpd.h"
-#include "eigrp.h"
-#include "log.h"
 #include "eigrpe.h"
+#include "log.h"
 
 extern struct eigrpd_conf	*econf;
 

rde.c

@@ -19,19 +19,21 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/route.h>
+
 #include <errno.h>
+#include <pwd.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
-#include <pwd.h>
+#include <unistd.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
-#include "log.h"
 #include "rde.h"
+#include "log.h"
 
 void		 rde_sig_handler(int sig, short, void *);
 __dead void	 rde_shutdown(void);

rde.h

@@ -19,12 +19,10 @@
 #ifndef _RDE_H_
 #define _RDE_H_
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/tree.h>
 #include <sys/queue.h>
+#include <sys/tree.h>
+
 #include <event.h>
-#include <limits.h>
 
 /* just the info RDE needs */
 struct rde_nbr {

rde_dual.c

@@ -16,15 +16,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <arpa/inet.h>
 
-#include "eigrp.h"
 #include "eigrpd.h"
 #include "eigrpe.h"
-#include "log.h"
 #include "rde.h"
+#include "log.h"
 
 void	reply_active_timer(int, short, void *);
 void	reply_active_start_timer(struct reply_node *);