Added used #include - don't depend on <sys/mbuf.h> including

<sys/malloc.h> (unless we only use the bogusly shared M*WAIT flags).

43 files changed, 79 insertions, 36 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 8e5c384..88619b8 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.14 1997/02/22 09:36:15 peter Exp $
+ * $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
  */
 
 /*
@@ -53,6 +53,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 8e5c384..88619b8 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.14 1997/02/22 09:36:15 peter Exp $
+ * $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
  */
 
 /*
@@ -53,6 +53,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index eafc297..676bac5 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.116 1997/03/24 11:32:39 bde Exp $
+ *	$Id: if_ed.c,v 1.117 1997/07/20 14:09:57 bde Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/sockio.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 8f466ff..bebff3f 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -62,6 +62,7 @@
  */
 #include <sys/devconf.h>
 #endif
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index f1af488..2b1d5d4 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.58 1997/03/24 11:32:45 bde Exp $
+ *  $Id: if_ep.c,v 1.59 1997/07/20 14:09:58 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -66,6 +66,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #endif
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index b2691c8..24f8cf3 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.43 1997/06/27 19:36:27 gibbs Exp $
+ *	$Id: if_ie.c,v 1.44 1997/07/20 14:09:59 bde Exp $
  */
 
 /*
@@ -112,6 +112,7 @@ iomem and and with 0xffff.
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 16789ef..604632f 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $
+ * $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
  */
 
 /*
@@ -58,6 +58,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 16789ef..604632f 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $
+ * $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
  */
 
 /*
@@ -58,6 +58,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 8e5c384..88619b8 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.14 1997/02/22 09:36:15 peter Exp $
+ * $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
  */
 
 /*
@@ -53,6 +53,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index 725e8f7..0c2b3a3 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -24,6 +24,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index eafc297..676bac5 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.116 1997/03/24 11:32:39 bde Exp $
+ *	$Id: if_ed.c,v 1.117 1997/07/20 14:09:57 bde Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/sockio.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index e74f325..ae6966d 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_eg.c,v 1.23 1997/03/24 11:32:41 bde Exp $
+ * $Id: if_eg.c,v 1.24 1997/07/20 14:09:57 bde Exp $
  *
  * Support for 3Com 3c505 Etherlink+ card.
  */
@@ -43,6 +43,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/sockio.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index f1af488..2b1d5d4 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.58 1997/03/24 11:32:45 bde Exp $
+ *  $Id: if_ep.c,v 1.59 1997/07/20 14:09:58 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -66,6 +66,7 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #endif
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index b2691c8..24f8cf3 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.43 1997/06/27 19:36:27 gibbs Exp $
+ *	$Id: if_ie.c,v 1.44 1997/07/20 14:09:59 bde Exp $
  */
 
 /*
@@ -112,6 +112,7 @@ iomem and and with 0xffff.
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 16789ef..604632f 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $
+ * $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
  */
 
 /*
@@ -58,6 +58,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index b5136b4..6db958c 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.60 1997/04/20 15:36:03 bde Exp $
+ *	$Id: lpt.c,v 1.61 1997/07/20 14:10:05 bde Exp $
  */
 
 /*
@@ -126,6 +126,7 @@
 #include <i386/isa/lptreg.h>
 
 #ifdef INET
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index a908e19..a18798d 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.23 1997/04/27 20:00:46 wollman Exp $
+ *	$Id: uipc_usrreq.c,v 1.24 1997/08/16 19:15:06 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -42,6 +42,7 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index f892ad8..49e798b 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.30 1997/03/23 03:37:14 bde Exp $
+ * $Id: bpf.c,v 1.31 1997/03/24 12:12:35 bde Exp $
  */
 
 #include "bpfilter.h"
@@ -53,6 +53,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/time.h>
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index f036bdd..f2ba1f8 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -40,12 +40,13 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $Id: bsd_comp.c,v 1.7 1997/08/19 14:10:44 peter Exp $
+ * $Id: bsd_comp.c,v 1.8 1997/08/19 17:07:07 peter Exp $
  */
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/sys/net/if.c b/sys/net/if.c
index 3dde807..4c28078 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- *	$Id: if.c,v 1.50 1997/08/22 22:47:27 julian Exp $
+ *	$Id: if.c,v 1.51 1997/08/28 01:17:07 julian Exp $
  */
 
 #include <sys/param.h>
 #include <sys/queue.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 93dcbe56..1133938 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
  *
  * From: Version 1.9, Wed Oct  4 18:58:15 MSK 1995
  *
- * $Id: if_spppsubr.c,v 1.24 1997/08/10 14:28:16 joerg Exp $
+ * $Id: if_spppsubr.c,v 1.25 1997/08/12 05:22:54 kjc Exp $
  */
 
 #include <sys/param.h>
@@ -26,6 +26,7 @@
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 
 #include <net/if.h>
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index 1049df5..464fbc8 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/*	$Id: ppp_deflate.c,v 1.1.2.1 1997/07/01 20:44:10 peter Exp $	*/
+/*	$Id: ppp_deflate.c,v 1.3 1997/08/19 14:10:46 peter Exp $	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <net/ppp_defs.h>
 #include <net/zlib.h>
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 9db18a3..d89c417 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- *	$Id: raw_cb.c,v 1.11 1997/04/14 18:23:22 phk Exp $
+ *	$Id: raw_cb.c,v 1.12 1997/04/27 20:00:58 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index 42715e8..ca24a30 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.41 1997/03/05 08:01:28 julian Exp $
+ *	$Id: route.c,v 1.42 1997/03/24 11:24:47 bde Exp $
  */
 
 #include "opt_mrouting.h"
@@ -41,6 +41,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 48c7996..c9a3759 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.31 1997/07/18 11:44:24 julian Exp $
+ *	$Id: rtsock.c,v 1.32 1997/08/16 19:15:32 wollman Exp $
  */
 
 
@@ -41,6 +41,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index d079b0f..9b25f80 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 6d9da4b..14ac37e 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -6,6 +6,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 6d9da4b..14ac37e 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -6,6 +6,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 2af8b70..73ac845 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id$
+ * $Id: igmp.c,v 1.21 1997/02/22 09:41:26 peter Exp $
  */
 
 /*
@@ -51,6 +51,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 483bab3..78d879d 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -33,11 +33,12 @@
  *
  *	@(#)ipx_pcb.c
  *
- * $Id: ipx_pcb.c,v 1.10 1997/06/26 19:35:53 jhay Exp $
+ * $Id: ipx_pcb.c,v 1.11 1997/08/16 19:15:44 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 216cfd4..b980d36 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,11 +33,12 @@
  *
  *	@(#)spx_usrreq.h
  *
- * $Id: spx_usrreq.c,v 1.14 1997/06/26 19:36:02 jhay Exp $
+ * $Id: spx_usrreq.c,v 1.15 1997/08/16 19:15:47 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 302de52..0866be1 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -47,6 +47,7 @@
 #endif
 #include <sys/proc.h>
 #include <sys/protosw.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index 2d8ca1d..5423686 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.3 1997/06/12 14:03:16 tegge Exp $	*/
+/*	$Id: krpc_subr.c,v 1.4 1997/08/16 19:15:53 wollman Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -49,6 +49,7 @@
 #include <sys/sockio.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/reboot.h>
 #include <sys/socket.h>
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index d7a1bdf..27e86b0 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $Id: nfs_nqlease.c,v 1.26 1997/07/16 09:06:27 dfr Exp $
+ * $Id: nfs_nqlease.c,v 1.27 1997/08/16 19:15:55 wollman Exp $
  */
 
 
@@ -57,6 +57,7 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index ce2ed43..30d9128 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.46 1997/07/22 15:35:15 dfr Exp $
+ * $Id: nfs_serv.c,v 1.47 1997/08/16 19:15:56 wollman Exp $
  */
 
 /*
@@ -66,6 +66,7 @@
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/dirent.h>
 #include <sys/stat.h>
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 4b41e67..82999f2 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.26 1997/06/03 17:22:46 dfr Exp $
+ * $Id: nfs_socket.c,v 1.27 1997/08/16 19:15:57 wollman Exp $
  */
 
 /*
@@ -46,6 +46,7 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/vnode.h>
 #include <sys/domain.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 12f168c..170c699 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.44 1997/06/27 19:10:46 wpaul Exp $
+ * $Id: nfs_vfsops.c,v 1.45 1997/08/16 19:16:04 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -48,6 +48,7 @@
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index 2d8ca1d..5423686 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.3 1997/06/12 14:03:16 tegge Exp $	*/
+/*	$Id: krpc_subr.c,v 1.4 1997/08/16 19:15:53 wollman Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -49,6 +49,7 @@
 #include <sys/sockio.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/reboot.h>
 #include <sys/socket.h>
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 4b41e67..82999f2 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.26 1997/06/03 17:22:46 dfr Exp $
+ * $Id: nfs_socket.c,v 1.27 1997/08/16 19:15:57 wollman Exp $
  */
 
 /*
@@ -46,6 +46,7 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/vnode.h>
 #include <sys/domain.h>
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 12f168c..170c699 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.44 1997/06/27 19:10:46 wpaul Exp $
+ * $Id: nfs_vfsops.c,v 1.45 1997/08/16 19:16:04 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -48,6 +48,7 @@
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index ce2ed43..30d9128 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.46 1997/07/22 15:35:15 dfr Exp $
+ * $Id: nfs_serv.c,v 1.47 1997/08/16 19:15:56 wollman Exp $
  */
 
 /*
@@ -66,6 +66,7 @@
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/dirent.h>
 #include <sys/stat.h>
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 4b41e67..82999f2 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.26 1997/06/03 17:22:46 dfr Exp $
+ * $Id: nfs_socket.c,v 1.27 1997/08/16 19:15:57 wollman Exp $
  */
 
 /*
@@ -46,6 +46,7 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/vnode.h>
 #include <sys/domain.h>
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 8f466ff..bebff3f 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -62,6 +62,7 @@
  */
 #include <sys/devconf.h>
 #endif
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>