Include <netinet/in.h> before <net/pfvar.h>. In a future change when

ports is ready, <net/pfvar.h> will stop including a pile of balony.

16 files changed, 45 insertions, 41 deletions

diff --git a/libexec/spamlogd/spamlogd.c b/libexec/spamlogd/spamlogd.c
index 18ce44a1e94..a05e7a53230 100644
--- a/libexec/spamlogd/spamlogd.c
+++ b/libexec/spamlogd/spamlogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamlogd.c,v 1.24 2015/01/16 06:39:50 deraadt Exp $	*/
+/*	$OpenBSD: spamlogd.c,v 1.25 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -29,13 +29,13 @@
 #include <sys/signal.h>
 
 #include <net/if.h>
-#include <net/if_pflog.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 
 #include <net/pfvar.h>
+#include <net/if_pflog.h>
 
 #include <db.h>
 #include <err.h>
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index 0c00e9e3ebd..53ada038f5a 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_print_state.c,v 1.63 2012/08/17 20:37:16 mikeb Exp $	*/
+/*	$OpenBSD: pf_print_state.c,v 1.64 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -34,9 +34,10 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #define TCPSTATES
+#include <netinet/in.h>
 #include <netinet/tcp_fsm.h>
-#include <net/pfvar.h>
 #include <arpa/inet.h>
+#include <net/pfvar.h>
 #include <netdb.h>
 
 #include <stdio.h>
diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c
index 66c283e18b8..9522dbf784a 100644
--- a/sbin/pfctl/pfctl_optimize.c
+++ b/sbin/pfctl/pfctl_optimize.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_optimize.c,v 1.34 2014/09/13 16:06:36 doug Exp $ */
+/*	$OpenBSD: pfctl_optimize.c,v 1.35 2015/01/21 21:50:33 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Mike Frantzen <frantzen@openbsd.org>
@@ -20,11 +20,10 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
-#include <net/pfvar.h>
-
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <net/if.h>
+#include <net/pfvar.h>
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c
index 2a151469127..82e6a8f8cce 100644
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_osfp.c,v 1.21 2015/01/16 06:40:00 deraadt Exp $ */
+/*	$OpenBSD: pfctl_osfp.c,v 1.22 2015/01/21 21:50:33 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@openbsd.org>
@@ -20,6 +20,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
+#include <netinet/in.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index 601f2cfdc31..4bc867f1c49 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_radix.c,v 1.31 2014/05/07 14:59:11 tedu Exp $ */
+/*	$OpenBSD: pfctl_radix.c,v 1.32 2015/01/21 21:50:33 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -34,6 +34,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
+#include <netinet/in.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 
diff --git a/usr.sbin/authpf/authpf.c b/usr.sbin/authpf/authpf.c
index 93cc3e4c2b8..ec09f31a23e 100644
--- a/usr.sbin/authpf/authpf.c
+++ b/usr.sbin/authpf/authpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: authpf.c,v 1.122 2015/01/15 23:59:28 deraadt Exp $	*/
+/*	$OpenBSD: authpf.c,v 1.123 2015/01/21 21:50:32 deraadt Exp $	*/
 
 /*
  * Copyright (C) 1998 - 2007 Bob Beck (beck@openbsd.org).
@@ -24,9 +24,10 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <net/if.h>
 #include <net/pfvar.h>
-#include <arpa/inet.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/bgpd/pftable.c b/usr.sbin/bgpd/pftable.c
index 9594b2b054b..f934a6533ea 100644
--- a/usr.sbin/bgpd/pftable.c
+++ b/usr.sbin/bgpd/pftable.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pftable.c,v 1.7 2014/10/08 16:15:37 deraadt Exp $ */
+/*	$OpenBSD: pftable.c,v 1.8 2015/01/21 21:50:32 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004 Damien Miller <djm@openbsd.org>
@@ -20,6 +20,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
+#include <netinet/in.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 
diff --git a/usr.sbin/dhcpd/pfutils.c b/usr.sbin/dhcpd/pfutils.c
index cdf1af8b196..8e385ab5b87 100644
--- a/usr.sbin/dhcpd/pfutils.c
+++ b/usr.sbin/dhcpd/pfutils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfutils.c,v 1.11 2015/01/16 06:40:16 deraadt Exp $ */
+/*	$OpenBSD: pfutils.c,v 1.12 2015/01/21 21:50:33 deraadt Exp $ */
 /*
  * Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
  *
@@ -20,9 +20,10 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <net/if.h>
 #include <net/pfvar.h>
-#include <arpa/inet.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/ftp-proxy/filter.c b/usr.sbin/ftp-proxy/filter.c
index 25ecc8208b9..dd4a9eebe47 100644
--- a/usr.sbin/ftp-proxy/filter.c
+++ b/usr.sbin/ftp-proxy/filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filter.c,v 1.20 2012/09/18 10:11:53 henning Exp $ */
+/*	$OpenBSD: filter.c,v 1.21 2015/01/21 21:50:33 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -20,11 +20,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
-#include <net/pfvar.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#include <net/if.h>
+#include <net/pfvar.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c
index 0803e414019..57d58fa97ff 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy.c
+++ b/usr.sbin/ftp-proxy/ftp-proxy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp-proxy.c,v 1.29 2014/09/13 16:06:37 doug Exp $ */
+/*	$OpenBSD: ftp-proxy.c,v 1.30 2015/01/21 21:50:33 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -22,10 +22,10 @@
 #include <sys/resource.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
-#include <net/pfvar.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <net/if.h>
+#include <net/pfvar.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/relayd/config.c b/usr.sbin/relayd/config.c
index 6537e6d5c04..16007b2b895 100644
--- a/usr.sbin/relayd/config.c
+++ b/usr.sbin/relayd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.22 2014/12/21 00:54:49 guenther Exp $	*/
+/*	$OpenBSD: config.c,v 1.23 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -22,10 +22,9 @@
 #include <sys/queue.h>
 #include <sys/uio.h>
 
+#include <netinet/in.h>
 #include <net/if.h>
 #include <net/pfvar.h>
-#include <netinet/in.h>
-#include <net/route.h>
 
 #include <ctype.h>
 #include <unistd.h>
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index 1c692c2f78b..be618dd2d20 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.200 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: parse.y,v 1.201 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -31,11 +31,10 @@
 #include <sys/queue.h>
 #include <sys/ioctl.h>
 
-#include <net/if.h>
-#include <net/pfvar.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <net/route.h>
+#include <net/if.h>
+#include <net/pfvar.h>
 
 #include <ctype.h>
 #include <unistd.h>
diff --git a/usr.sbin/relayd/pfe_filter.c b/usr.sbin/relayd/pfe_filter.c
index 19cb4d85bc4..a78a5d39303 100644
--- a/usr.sbin/relayd/pfe_filter.c
+++ b/usr.sbin/relayd/pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.55 2015/01/16 15:06:40 deraadt Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.56 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -21,11 +21,11 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include <net/if.h>
-#include <net/pfvar.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>
diff --git a/usr.sbin/snmpd/mib.c b/usr.sbin/snmpd/mib.c
index 8276dfc6e32..8e4d98fba7e 100644
--- a/usr.sbin/snmpd/mib.c
+++ b/usr.sbin/snmpd/mib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mib.c,v 1.74 2015/01/16 00:05:13 deraadt Exp $	*/
+/*	$OpenBSD: mib.c,v 1.75 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Knight <joel@openbsd.org>
@@ -33,15 +33,15 @@
 #include <sys/ioctl.h>
 #include <sys/disk.h>
 
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/pfvar.h>
-#include <net/if_pfsync.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_carp.h>
 #include <netinet/ip_var.h>
 #include <arpa/inet.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/pfvar.h>
+#include <net/if_pfsync.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/snmpd/pf.c b/usr.sbin/snmpd/pf.c
index 4cdc82e1164..5421583f223 100644
--- a/usr.sbin/snmpd/pf.c
+++ b/usr.sbin/snmpd/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.8 2015/01/16 00:05:13 deraadt Exp $	*/
+/*	$OpenBSD: pf.c,v 1.9 2015/01/21 21:50:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Knight <joel@openbsd.org>
@@ -35,9 +35,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <net/if.h>
 #include <net/pfvar.h>
-#include <arpa/inet.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/tftp-proxy/filter.c b/usr.sbin/tftp-proxy/filter.c
index 4d4cf379d4c..2e63f41e4ed 100644
--- a/usr.sbin/tftp-proxy/filter.c
+++ b/usr.sbin/tftp-proxy/filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filter.c,v 1.1 2012/07/11 11:43:27 dlg Exp $ */
+/*	$OpenBSD: filter.c,v 1.2 2015/01/21 21:50:33 deraadt Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -22,11 +22,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
-#include <net/pfvar.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#include <net/if.h>
+#include <net/pfvar.h>
 
 #include <err.h>
 #include <errno.h>