commit d93c36af2b8111f07ff7645770d4714a2e5aef96
from: reyk <reyk@openbsd.org>
date: Thu Jan 22 17:42:09 2015 UTC

Clean up the relayd headers with help of include-what-you-use and some
manual review.  Based on common practice, relayd.h now includes the
necessary headers for itself.

OK benno@

commit - 63e504f7b640758736c4b123952ab9e96c9cb97f
commit + d93c36af2b8111f07ff7645770d4714a2e5aef96
blob - 24b07de8092b833e4d835fd7de1cfd20ca80b514
blob + 5b6f33e93732c0e51210ad03f4bfcafd73b0a42f
--- agentx.c
+++ agentx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: agentx.c,v 1.10 2015/01/22 15:21:28 reyk Exp $    */
+/*      $OpenBSD: agentx.c,v 1.11 2015/01/22 17:42:09 reyk Exp $    */
 /*
  * Copyright (c) 2013,2014 Bret Stephen Lambert <blambert@openbsd.org>
  *
@@ -17,11 +17,9 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/uio.h>
+#include <sys/queue.h>
 #include <sys/un.h>
 
-#include <err.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
blob - 6964a0b70e36ebc6e083c67285249036f8da70db
blob + 0b79b62f75b4831706acd84da7db050b13aa2dda
--- ca.c
+++ ca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ca.c,v 1.11 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: ca.c,v 1.12 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -16,21 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/uio.h>
 
-#include <net/if.h>
-#include <netinet/in.h>
-
-#include <limits.h>
-#include <event.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <imsg.h>
 
+#include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
blob - ba5836b67c5ecb592ba052b8fcd30ef6ac661c11
blob + 09708aa7dbfdf05c04c12003cfb79a9548e02d9b
--- carp.c
+++ carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: carp.c,v 1.10 2015/01/16 15:06:40 deraadt Exp $ */
+/*	$OpenBSD: carp.c,v 1.11 2015/01/22 17:42:09 reyk Exp $ */
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -16,7 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/queue.h>
 #include <sys/ioctl.h>
 
 #include <net/if.h>
@@ -25,10 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <event.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 struct carpgroup {
blob - 3fefb8ad469c95c995d11dfd1c91c00f52adc209
blob + d6f5ffb7ba051582a2e88d73eb79c94d34a90dac
--- check_icmp.c
+++ check_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_icmp.c,v 1.39 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: check_icmp.c,v 1.40 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -20,22 +20,20 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
+#include <sys/time.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp6.h>
+#include <arpa/inet.h>
 
-#include <limits.h>
 #include <event.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 void	icmp_setup(struct relayd *, struct ctl_icmp_event *, int);
blob - 0e22176f64b49db1895714f2e5b1947b9ff0fca6
blob + 217dc89f02482c16799c80d8e69547790e93a370
--- check_script.c
+++ check_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_script.c,v 1.17 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: check_script.c,v 1.18 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -16,24 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/time.h>
 
-#include <net/if.h>
-
-#include <limits.h>
-#include <event.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <pwd.h>
-#include <err.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 void	 script_sig_alarm(int);
blob - d439471f8d59818901b69d07e3f40d9b90de0c4d
blob + 246d0ec8062fffef9eaa8930c6d13446a53396b4
--- check_tcp.c
+++ check_tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_tcp.c,v 1.45 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: check_tcp.c,v 1.46 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,10 +16,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
 
 #include <limits.h>
@@ -31,9 +31,8 @@
 #include <errno.h>
 #include <fnmatch.h>
 #include <sha1.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 void	tcp_write(int, short, void *);
blob - 16007b2b895c17431017cb5fb60bfddb5cf7abfb
blob + 9cfbdca6872a99ce52bf64e06b442df8c10c2cd8
--- config.c
+++ config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.23 2015/01/21 21:50:33 deraadt Exp $	*/
+/*	$OpenBSD: config.c,v 1.24 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -17,30 +17,17 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/queue.h>
+#include <sys/time.h>
 #include <sys/uio.h>
 
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/pfvar.h>
-
-#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <err.h>
-#include <errno.h>
-#include <event.h>
 #include <limits.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <netdb.h>
 #include <string.h>
-#include <ifaddrs.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 int
blob - 2272e341e834586d4412cbc610d7818062169680
blob + 8c72b78748e59480de75956eb905eb494fd69b47
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.47 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: control.c,v 1.48 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -19,20 +19,17 @@
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/un.h>
 
-#include <net/if.h>
-
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <signal.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 #define	CONTROL_BACKLOG	5
blob - 70748dd8a17224d765164ef6ef0b8b082ebaca1d
blob + f7fc77cc1441c2214c4cc21aa9e63c1719529fd4
--- hce.c
+++ hce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hce.c,v 1.68 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: hce.c,v 1.69 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,27 +16,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/un.h>
+#include <sys/uio.h>
 
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-
-#include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <err.h>
-#include <pwd.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 void	 hce_init(struct privsep *, struct privsep_proc *p, void *);
blob - ff4e3bbf4186d33d3055ac635fc05f65f302fbac
blob + 58fc6de52025c3ef4b3382d276ea6ed94a22d646
--- log.c
+++ log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.26 2014/12/21 00:54:49 guenther Exp $	*/
+/*	$OpenBSD: log.c,v 1.27 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -17,26 +17,19 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/tree.h>
+#include <sys/time.h>
 
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <event.h>
 #include <netdb.h>
 #include <ctype.h>
+#include <time.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 int	 debug;
blob - 4009fc6488bda8bc936c6c6e4fdc10dbbe1d57a4
blob + e4220c55fd739675a009890f859bb7283aa9d056
--- name2id.c
+++ name2id.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: name2id.c,v 1.3 2014/07/09 16:42:05 reyk Exp $	*/
+/*	$OpenBSD: name2id.c,v 1.4 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -17,18 +17,12 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/queue.h>
 
-#include <net/if.h>
-
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <event.h>
+#include <errno.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 #define	IDVAL_MAX	50000
blob - be618dd2d205fa36e6e140b47bdee1fbb9b701d5
blob + 9605c8d41ddaafc4ef22c95ce3bc4d3ec7d574db
--- parse.y
+++ parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.201 2015/01/21 21:50:33 deraadt Exp $	*/
+/*	$OpenBSD: parse.y,v 1.202 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -30,29 +30,30 @@
 #include <sys/stat.h>
 #include <sys/queue.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/tree.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <net/pfvar.h>
+#include <net/route.h>
 
-#include <ctype.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdio.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <err.h>
+#include <endian.h>
 #include <errno.h>
-#include <event.h>
 #include <limits.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <netdb.h>
 #include <string.h>
 #include <ifaddrs.h>
 #include <syslog.h>
 #include <md5.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 #include "http.h"
 #include "snmp.h"
blob - c7ddde9390262d753d8e13be3c0b547b52c5a128
blob + 42afc1ff8cecfa3b2689259ed5826b34d631c4c9
--- pfe.c
+++ pfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe.c,v 1.77 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: pfe.c,v 1.78 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -16,22 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/time.h>
+#include <sys/uio.h>
 
-#include <net/if.h>
-
-#include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <pwd.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 void	 pfe_init(struct privsep *, struct privsep_proc *p, void *);
blob - 7a4fc4defbbb2dd8a8e0e24f3504de82e215c04d
blob + 30db9ef04ae9ee29019ca06ad703b164ed8911d6
--- pfe_filter.c
+++ pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.57 2015/01/22 15:21:28 reyk Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.58 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -19,25 +19,22 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/ioctl.h>
 
+#include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <net/if.h>
 #include <net/pfvar.h>
 
 #include <limits.h>
-#include <fcntl.h>
-#include <event.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include <openssl/ssl.h>
-
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
 
 #include "relayd.h"
blob - 135b935986205b32dc57f6e65400961c8a51d19c
blob + fa5336425d6401a86608cb63900fc85e50db52b8
--- pfe_route.c
+++ pfe_route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_route.c,v 1.8 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: pfe_route.c,v 1.9 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2009 - 2011 Reyk Floeter <reyk@openbsd.org>
@@ -20,19 +20,16 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
 #include <net/route.h>
+#include <arpa/inet.h>
 
+#include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <event.h>
 #include <string.h>
 #include <errno.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 struct relay_rtmsg {
blob - d8c67611d9c3c75259c95c25633b8a522d3a4522
blob + f4e5908bf0872b0c106d3f72173529fd26615d7a
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.19 2014/12/21 00:54:49 guenther Exp $	*/
+/*	$OpenBSD: proc.c,v 1.20 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -21,12 +21,7 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/tree.h>
 
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -35,9 +30,8 @@
 #include <signal.h>
 #include <pwd.h>
 #include <event.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 void	 proc_open(struct privsep *, struct privsep_proc *,
blob - d63787e21075fe18780b51bc398f715eaa1345da
blob + 34e7312d45d2b37fd01725f4e52d5a5ddca33b61
--- relay.c
+++ relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.189 2015/01/22 15:21:28 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.190 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -21,24 +21,22 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/tree.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
+#include <arpa/inet.h>
 
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <err.h>
-#include <pwd.h>
 #include <event.h>
-#include <fnmatch.h>
+#include <siphash.h>
+#include <imsg.h>
 
 #include <openssl/dh.h>
 #include <openssl/ssl.h>
blob - 7ab81b28d4c8788f5fcb2d69ecd891572493ca5e
blob + 1d0b3220475f7f48b6b033e1d94db6f42598ebf1
--- relay_http.c
+++ relay_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_http.c,v 1.42 2015/01/22 15:21:28 reyk Exp $	*/
+/*	$OpenBSD: relay_http.c,v 1.43 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -19,29 +19,23 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/tree.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
+#include <arpa/inet.h>
 
-#include <errno.h>
-#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <err.h>
-#include <pwd.h>
+#include <time.h>
 #include <event.h>
 #include <fnmatch.h>
+#include <siphash.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 #include "http.h"
 
blob - ccd85670275e8c5bfd12bf9f44e887ec35266e35
blob + a59c4e2dd06eac3e222e339139588e4944d80359
--- relay_udp.c
+++ relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.38 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.39 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org>
@@ -19,15 +19,11 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/tree.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
+#include <arpa/inet.h>
 
 #include <signal.h>
 #include <errno.h>
@@ -36,13 +32,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <err.h>
-#include <pwd.h>
 #include <event.h>
-#include <fnmatch.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 extern volatile sig_atomic_t relay_sessions;
blob - 6fd07f03918bd55e77b4021913ae09a1c721f83f
blob + de921959aaa1aef5944b61d2b75305f09aea5371
--- relayd.c
+++ relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.137 2015/01/22 15:21:28 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.138 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-#include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
blob - e78ecc674fa3f62c7981da53a67638e149b9d3f0
blob + 2bdfe5533497c3a31d6a47a1e04572841314c8b3
--- relayd.h
+++ relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.206 2015/01/22 09:26:05 reyk Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.207 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -21,13 +21,22 @@
 #ifndef _RELAYD_H
 #define _RELAYD_H
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/queue.h>
 #include <sys/tree.h>
+#include <sys/time.h>
 
-#include <netinet/in.h>
+#include <net/if.h>
+
+#include <stdarg.h>
 #include <limits.h>
-#include <imsg.h>
 #include <siphash.h>
+#include <event.h>
+#include <imsg.h>
 
+#include <openssl/ssl.h>
+
 #ifndef nitems
 #define	nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
 #endif
@@ -519,7 +528,6 @@ struct rdr {
 };
 TAILQ_HEAD(rdrlist, rdr);
 
-struct relay;
 struct rsession {
 	objid_t				 se_id;
 	objid_t				 se_relayid;
@@ -791,7 +799,6 @@ enum dstmode {
 };
 #define RELAY_DSTMODE_DEFAULT		RELAY_DSTMODE_ROUNDROBIN
 
-struct router;
 struct netroute_config {
 	objid_t			 id;
 	struct sockaddr_storage	 ss;
@@ -861,7 +868,6 @@ enum blockmodes {
 	BM_NONBLOCK
 };
 
-
 struct imsgev {
 	struct imsgbuf		 ibuf;
 	void			(*handler)(int, short, void *);
blob - 256d16dba16a8b1437a6e300f163f58314932bbe
blob + e6173d69f241c597e46fc3bf494ec3fe82b39982
--- shuffle.c
+++ shuffle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shuffle.c,v 1.3 2014/12/21 00:54:49 guenther Exp $	*/
+/*	$OpenBSD: shuffle.c,v 1.4 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Portions Copyright (C) 2008 Theo de Raadt
@@ -20,18 +20,10 @@
 /* based on: bind/lib/isc/shuffle.c,v 1.4 2008/07/09 17:07:32 reyk Exp $ */
 
 #include <sys/types.h>
-#include <sys/socket.h>
 
-#include <netinet/in.h>
-#include <net/if.h>
-
 #include <stdlib.h>
-#include <string.h>
-#include <event.h>
 #include <assert.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 
 #define VALID_SHUFFLE(x)	(x != NULL)
blob - dafd2f2e1f7a0f496518da39a5a79fc16ae10129
blob + 5cbb91fe652a193fb2fb9b4682a93527bc510628
--- snmp.c
+++ snmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmp.c,v 1.22 2015/01/22 15:21:05 reyk Exp $	*/
+/*	$OpenBSD: snmp.c,v 1.23 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -18,23 +18,22 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/queue.h>
+#include <sys/time.h>
 #include <sys/un.h>
-#include <sys/uio.h>
 
 #include <netinet/in.h>
-#include <net/if.h>
 
-#include <errno.h>
-#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <err.h>
 #include <event.h>
+#include <imsg.h>
 
-#include <openssl/ssl.h>
-
 #include "relayd.h"
 #include "snmp.h"
 
blob - b8133296eaa4159c43069b1261ffbc560c360508
blob + 815957939e38ebd8c91971cf09d03a20435311cb
--- ssl.c
+++ ssl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.c,v 1.27 2015/01/16 15:06:41 deraadt Exp $	*/
+/*	$OpenBSD: ssl.c,v 1.28 2015/01/22 17:42:09 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -17,24 +17,20 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
-#include <netinet/in.h>
-
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <event.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <imsg.h>
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
-#include <openssl/rsa.h>
 
 #include "relayd.h"