From ddfcc186eba69f0c1c8a9ca96ebfea207f98c876 Mon Sep 17 00:00:00 2001 From: riastradh Date: Fri, 28 Aug 2020 07:01:57 +0000 Subject: netinet: Include the needful so include order doesn't matter. --- sys/netinet/in_pcb.h | 27 +++++++++++++++++++++++---- sys/netinet/in_pcb_hdr.h | 9 ++++++++- sys/netinet/in_systm.h | 4 +++- sys/netinet/ip.h | 9 +++++++-- 4 files changed, 41 insertions(+), 8 deletions(-) (limited to 'sys') diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 31abfecc308..d83285bb4d5 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -1,4 +1,4 @@ -/* $NetBSD: in_pcb.h,v 1.67 2020/08/20 21:21:32 riastradh Exp $ */ +/* $NetBSD: in_pcb.h,v 1.68 2020/08/28 07:01:57 riastradh Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -63,9 +63,16 @@ #ifndef _NETINET_IN_PCB_H_ #define _NETINET_IN_PCB_H_ -#include +#include + #include + +#include #include +#include + +struct ip_moptions; +struct mbuf; /* * Common structure pcb for internet protocol implementation. @@ -133,6 +140,17 @@ struct inpcb { #define inp_locked(inp) solocked((inp)->inp_socket) #ifdef _KERNEL + +#include +#include + +struct inpcbtable; +struct lwp; +struct rtentry; +struct sockaddr_in; +struct socket; +struct vestigial_inpcb; + void in_losing(struct inpcb *); int in_pcballoc(struct socket *, void *); int in_pcbbindableaddr(struct sockaddr_in *, kauth_cred_t); @@ -173,6 +191,7 @@ in_pcb_register_overudp_cb(struct inpcb *inp, pcb_overudp_cb_t cb, void *arg) inp->inp_overudp_cb = cb; inp->inp_overudp_arg = arg; } -#endif -#endif /* !_NETINET_IN_PCB_H_ */ +#endif /* _KERNEL */ + +#endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/in_pcb_hdr.h b/sys/netinet/in_pcb_hdr.h index d152abc1619..0e3dcf7f577 100644 --- a/sys/netinet/in_pcb_hdr.h +++ b/sys/netinet/in_pcb_hdr.h @@ -1,4 +1,4 @@ -/* $NetBSD: in_pcb_hdr.h,v 1.14 2020/08/20 21:21:32 riastradh Exp $ */ +/* $NetBSD: in_pcb_hdr.h,v 1.15 2020/08/28 07:01:57 riastradh Exp $ */ /* * Copyright (C) 2003 WIDE Project. @@ -63,9 +63,16 @@ #ifndef _NETINET_IN_PCB_HDR_H_ #define _NETINET_IN_PCB_HDR_H_ +#include #include +#include + struct inpcbpolicy; +struct inpcbtable; +struct mbuf; +struct sockaddr; +struct socket; /* * align it with inpcb and in6pcb! diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index ff53fb7b956..f806e5c6dd3 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -1,4 +1,4 @@ -/* $NetBSD: in_systm.h,v 1.13 2005/12/10 23:36:23 elad Exp $ */ +/* $NetBSD: in_systm.h,v 1.14 2020/08/28 07:01:57 riastradh Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -39,6 +39,8 @@ * definitions for kernel. */ +#include + /* * Network types. * diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h index d2ebb568044..a1461075441 100644 --- a/sys/netinet/ip.h +++ b/sys/netinet/ip.h @@ -1,4 +1,4 @@ -/* $NetBSD: ip.h,v 1.34 2012/11/02 21:07:07 christos Exp $ */ +/* $NetBSD: ip.h,v 1.35 2020/08/28 07:01:57 riastradh Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,7 +34,11 @@ #ifndef _NETINET_IP_H_ #define _NETINET_IP_H_ +#include + +#include #include /* for n_time */ + /* * Definitions for internet protocol version 4. * Per RFC 791, September 1981. @@ -243,4 +247,5 @@ struct ippseudo { u_int8_t ippseudo_p; /* protocol */ u_int16_t ippseudo_len; /* protocol length */ } __packed; -#endif /* !_NETINET_IP_H_ */ + +#endif /* !_NETINET_IP_H_ */ -- cgit