From owner-svn-src-all@freebsd.org  Mon Feb  1 17:41:29 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9897CA97C95;
 Mon,  1 Feb 2016 17:41:29 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6343E176;
 Mon,  1 Feb 2016 17:41:29 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u11HfSwa065846;
 Mon, 1 Feb 2016 17:41:28 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u11HfL9b065169;
 Mon, 1 Feb 2016 17:41:21 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201602011741.u11HfL9b065169@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 1 Feb 2016 17:41:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295126 - in head/sys: contrib/ipfilter/netinet dev/bwn
 dev/ed dev/ep dev/fe dev/fxp dev/iscsi_initiator dev/le dev/malo dev/netmap
 dev/oce dev/otus dev/sfxge dev/sn dev/tx dev/usb/wlan...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2016 17:41:29 -0000

Author: glebius
Date: Mon Feb  1 17:41:21 2016
New Revision: 295126
URL: https://svnweb.freebsd.org/changeset/base/295126

Log:
  These files were getting sys/malloc.h and vm/uma.h with header pollution
  via sys/mbuf.h

Modified:
  head/sys/contrib/ipfilter/netinet/ip_compat.h
  head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/ed/if_ed.c
  head/sys/dev/ep/if_ep.c
  head/sys/dev/fe/if_fe.c
  head/sys/dev/fxp/if_fxp.c
  head/sys/dev/iscsi_initiator/isc_cam.c
  head/sys/dev/iscsi_initiator/isc_sm.c
  head/sys/dev/iscsi_initiator/isc_soc.c
  head/sys/dev/iscsi_initiator/isc_subr.c
  head/sys/dev/iscsi_initiator/iscsi_subr.c
  head/sys/dev/le/lance.c
  head/sys/dev/malo/if_malo.c
  head/sys/dev/netmap/netmap_offloadings.c
  head/sys/dev/oce/oce_if.h
  head/sys/dev/otus/if_otus.c
  head/sys/dev/sfxge/sfxge_rx.c
  head/sys/dev/sfxge/sfxge_tx.c
  head/sys/dev/sn/if_sn.c
  head/sys/dev/tx/if_tx.c
  head/sys/dev/usb/wlan/if_rsu.c
  head/sys/dev/wi/if_wi.c
  head/sys/dev/wi/if_wi_pci.c
  head/sys/dev/xe/if_xe.c
  head/sys/dev/xl/if_xl.c
  head/sys/kern/subr_mchain.c
  head/sys/kern/uipc_sockbuf.c
  head/sys/net/bridgestp.c
  head/sys/net/if_epair.c
  head/sys/net/if_mib.c
  head/sys/net/netisr.c
  head/sys/net/pfvar.h
  head/sys/net80211/ieee80211.c
  head/sys/net80211/ieee80211_acl.c
  head/sys/net80211/ieee80211_action.c
  head/sys/net80211/ieee80211_ageq.c
  head/sys/net80211/ieee80211_amrr.c
  head/sys/net80211/ieee80211_crypto_none.c
  head/sys/net80211/ieee80211_ddb.c
  head/sys/net80211/ieee80211_freebsd.c
  head/sys/net80211/ieee80211_ht.c
  head/sys/net80211/ieee80211_ioctl.c
  head/sys/net80211/ieee80211_output.c
  head/sys/net80211/ieee80211_power.c
  head/sys/net80211/ieee80211_proto.c
  head/sys/net80211/ieee80211_scan.c
  head/sys/net80211/ieee80211_scan_sta.c
  head/sys/net80211/ieee80211_scan_sw.c
  head/sys/net80211/ieee80211_xauth.c
  head/sys/netgraph/netflow/netflow.c
  head/sys/netgraph/netflow/netflow_v9.c
  head/sys/netgraph/netflow/ng_netflow.c
  head/sys/netgraph/ng_base.c
  head/sys/netinet/in_proto.c
  head/sys/netinet/tcp_lro.c
  head/sys/netinet/toecore.c
  head/sys/netinet6/in6_proto.c
  head/sys/netinet6/send.c
  head/sys/netipsec/ipsec_mbuf.c
  head/sys/netipsec/key_debug.c
  head/sys/netpfil/ipfw/ip_fw_log.c
  head/sys/rpc/replay.c

Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_compat.h	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/contrib/ipfilter/netinet/ip_compat.h	Mon Feb  1 17:41:21 2016	(r295126)
@@ -147,6 +147,7 @@ struct  ether_addr {
 
 #  include <sys/selinfo.h>
 #  include <sys/lock.h>
+#  include <sys/malloc.h>
 #  include <sys/mutex.h>
 #    define	KRWLOCK_FILL_SZ		56
 #    define	KMUTEX_FILL_SZ		56

Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -36,6 +36,7 @@ static const char rcsid[] = "@(#)$Id$";
 #if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000)
 #include <sys/jail.h>
 #endif
+# include <sys/malloc.h>
 # include <sys/mbuf.h>
 # include <sys/sockopt.h>
 #if !defined(__hpux)

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/bwn/if_bwn.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -36,8 +36,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/module.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/firmware.h>

Modified: head/sys/dev/ed/if_ed.c
==============================================================================
--- head/sys/dev/ed/if_ed.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/ed/if_ed.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -43,8 +43,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
-#include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>

Modified: head/sys/dev/ep/if_ep.c
==============================================================================
--- head/sys/dev/ep/if_ep.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/ep/if_ep.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

Modified: head/sys/dev/fe/if_fe.c
==============================================================================
--- head/sys/dev/fe/if_fe.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/fe/if_fe.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

Modified: head/sys/dev/fxp/if_fxp.c
==============================================================================
--- head/sys/dev/fxp/if_fxp.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/fxp/if_fxp.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/rman.h>

Modified: head/sys/dev/iscsi_initiator/isc_cam.c
==============================================================================
--- head/sys/dev/iscsi_initiator/isc_cam.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/iscsi_initiator/isc_cam.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
+#include <vm/uma.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>

Modified: head/sys/dev/iscsi_initiator/isc_sm.c
==============================================================================
--- head/sys/dev/iscsi_initiator/isc_sm.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/iscsi_initiator/isc_sm.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/sbuf.h>
 #include <sys/sx.h>
+#include <vm/uma.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>

Modified: head/sys/dev/iscsi_initiator/isc_soc.c
==============================================================================
--- head/sys/dev/iscsi_initiator/isc_soc.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/iscsi_initiator/isc_soc.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #include <sys/mbuf.h>
 #include <sys/user.h>
+#include <vm/uma.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>

Modified: head/sys/dev/iscsi_initiator/isc_subr.c
==============================================================================
--- head/sys/dev/iscsi_initiator/isc_subr.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/iscsi_initiator/isc_subr.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #include <sys/mbuf.h>
 #include <sys/libkern.h>
+#include <vm/uma.h>
 
 #include <dev/iscsi_initiator/iscsi.h>
 #include <dev/iscsi_initiator/iscsivar.h>

Modified: head/sys/dev/iscsi_initiator/iscsi_subr.c
==============================================================================
--- head/sys/dev/iscsi_initiator/iscsi_subr.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/iscsi_initiator/iscsi_subr.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
+#include <vm/uma.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>

Modified: head/sys/dev/le/lance.c
==============================================================================
--- head/sys/dev/le/lance.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/le/lance.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/socket.h>

Modified: head/sys/dev/malo/if_malo.c
==============================================================================
--- head/sys/dev/malo/if_malo.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/malo/if_malo.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>

Modified: head/sys/dev/netmap/netmap_offloadings.c
==============================================================================
--- head/sys/dev/netmap/netmap_offloadings.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/netmap/netmap_offloadings.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/param.h>	/* defines used in kernel.h */
+#include <sys/malloc.h>	/* types used in module initialization */
 #include <sys/kernel.h>	/* types used in module initialization */
 #include <sys/sockio.h>
 #include <sys/socketvar.h>	/* struct socket */

Modified: head/sys/dev/oce/oce_if.h
==============================================================================
--- head/sys/dev/oce/oce_if.h	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/oce/oce_if.h	Mon Feb  1 17:41:21 2016	(r295126)
@@ -41,6 +41,7 @@
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/eventhandler.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>

Modified: head/sys/dev/otus/if_otus.c
==============================================================================
--- head/sys/dev/otus/if_otus.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/otus/if_otus.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/conf.h>

Modified: head/sys/dev/sfxge/sfxge_rx.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_rx.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/sfxge/sfxge_rx.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -34,7 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/smp.h>
 #include <sys/socket.h>

Modified: head/sys/dev/sfxge/sfxge_tx.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_tx.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/sfxge/sfxge_tx.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -49,7 +49,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/smp.h>
 #include <sys/socket.h>

Modified: head/sys/dev/sn/if_sn.c
==============================================================================
--- head/sys/dev/sn/if_sn.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/sn/if_sn.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/sockio.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>

Modified: head/sys/dev/tx/if_tx.c
==============================================================================
--- head/sys/dev/tx/if_tx.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/tx/if_tx.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/queue.h>

Modified: head/sys/dev/usb/wlan/if_rsu.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rsu.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/usb/wlan/if_rsu.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/sockio.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>

Modified: head/sys/dev/wi/if_wi.c
==============================================================================
--- head/sys/dev/wi/if_wi.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/wi/if_wi.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <sys/bus.h>

Modified: head/sys/dev/wi/if_wi_pci.c
==============================================================================
--- head/sys/dev/wi/if_wi_pci.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/wi/if_wi_pci.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -42,6 +42,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/module.h>

Modified: head/sys/dev/xe/if_xe.c
==============================================================================
--- head/sys/dev/xe/if_xe.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/xe/if_xe.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -96,6 +96,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

Modified: head/sys/dev/xl/if_xl.c
==============================================================================
--- head/sys/dev/xl/if_xl.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/dev/xl/if_xl.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -106,8 +106,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
-#include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/taskqueue.h>

Modified: head/sys/kern/subr_mchain.c
==============================================================================
--- head/sys/kern/subr_mchain.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/kern/subr_mchain.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/uio.h>

Modified: head/sys/kern/uipc_sockbuf.c
==============================================================================
--- head/sys/kern/uipc_sockbuf.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/kern/uipc_sockbuf.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/aio.h> /* for aio_swake proto */
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>

Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net/bridgestp.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/module.h>
 #include <sys/proc.h>

Modified: head/sys/net/if_epair.c
==============================================================================
--- head/sys/net/if_epair.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net/if_epair.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/refcount.h>

Modified: head/sys/net/if_mib.c
==============================================================================
--- head/sys/net/if_mib.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net/if_mib.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 

Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net/netisr.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/malloc.h>
 #include <sys/interrupt.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>

Modified: head/sys/net/pfvar.h
==============================================================================
--- head/sys/net/pfvar.h	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net/pfvar.h	Mon Feb  1 17:41:21 2016	(r295126)
@@ -36,8 +36,10 @@
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/counter.h>
+#include <sys/malloc.h>
 #include <sys/refcount.h>
 #include <sys/tree.h>
+#include <vm/uma.h>
 
 #include <net/radix.h>
 #include <netinet/in.h>

Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/sbuf.h>
 

Modified: head/sys/net80211/ieee80211_acl.c
==============================================================================
--- head/sys/net80211/ieee80211_acl.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_acl.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h> 
+#include <sys/malloc.h>   
 #include <sys/mbuf.h>   
 #include <sys/module.h>
 #include <sys/queue.h>

Modified: head/sys/net80211/ieee80211_action.c
==============================================================================
--- head/sys/net80211/ieee80211_action.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_action.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/systm.h> 
  
 #include <sys/socket.h>

Modified: head/sys/net80211/ieee80211_ageq.c
==============================================================================
--- head/sys/net80211/ieee80211_ageq.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_ageq.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>
+#include <sys/malloc.h>
  
 #include <sys/socket.h>
 

Modified: head/sys/net80211/ieee80211_amrr.c
==============================================================================
--- head/sys/net80211/ieee80211_amrr.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_amrr.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>

Modified: head/sys/net80211/ieee80211_crypto_none.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_none.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_crypto_none.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h> 
+#include <sys/malloc.h> 
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
 #include <sys/module.h>

Modified: head/sys/net80211/ieee80211_ddb.c
==============================================================================
--- head/sys/net80211/ieee80211_ddb.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_ddb.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 
 #include <net/if.h>

Modified: head/sys/net80211/ieee80211_freebsd.c
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_freebsd.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -32,10 +32,11 @@ __FBSDID("$FreeBSD$");
 #include "opt_wlan.h"
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h> 
 #include <sys/eventhandler.h>
+#include <sys/kernel.h>
 #include <sys/linker.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>   
 #include <sys/module.h>
 #include <sys/proc.h>

Modified: head/sys/net80211/ieee80211_ht.c
==============================================================================
--- head/sys/net80211/ieee80211_ht.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_ht.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/systm.h> 
 #include <sys/endian.h>
  

Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_ioctl.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_output.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -33,8 +33,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
-#include <sys/mbuf.h>   
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>   
 #include <sys/endian.h>
 
 #include <sys/socket.h>

Modified: head/sys/net80211/ieee80211_power.c
==============================================================================
--- head/sys/net80211/ieee80211_power.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_power.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>
+#include <sys/malloc.h>
  
 #include <sys/socket.h>
 

Modified: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_proto.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -35,8 +35,9 @@ __FBSDID("$FreeBSD$");
 #include "opt_wlan.h"
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>

Modified: head/sys/net80211/ieee80211_scan.c
==============================================================================
--- head/sys/net80211/ieee80211_scan.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_scan.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h> 
 #include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/condvar.h>
  
 #include <sys/socket.h>

Modified: head/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sta.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_scan_sta.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 
 #include <sys/socket.h>

Modified: head/sys/net80211/ieee80211_scan_sw.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sw.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_scan_sw.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h> 
 #include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/condvar.h>
  
 #include <sys/socket.h>

Modified: head/sys/net80211/ieee80211_xauth.c
==============================================================================
--- head/sys/net80211/ieee80211_xauth.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/net80211/ieee80211_xauth.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h> 
+#include <sys/malloc.h>   
 #include <sys/mbuf.h>   
 #include <sys/module.h>
 

Modified: head/sys/netgraph/netflow/netflow.c
==============================================================================
--- head/sys/netgraph/netflow/netflow.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netgraph/netflow/netflow.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
+#include <vm/uma.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>

Modified: head/sys/netgraph/netflow/netflow_v9.c
==============================================================================
--- head/sys/netgraph/netflow/netflow_v9.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netgraph/netflow/netflow_v9.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -37,9 +37,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/limits.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
+#include <vm/uma.h>
 
 #include <net/if.h>
 #include <net/route.h>

Modified: head/sys/netgraph/netflow/ng_netflow.c
==============================================================================
--- head/sys/netgraph/netflow/ng_netflow.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netgraph/netflow/ng_netflow.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -40,10 +40,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/limits.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/ctype.h>
+#include <vm/uma.h>
 
 #include <net/if.h>
 #include <net/ethernet.h>

Modified: head/sys/netgraph/ng_base.c
==============================================================================
--- head/sys/netgraph/ng_base.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netgraph/ng_base.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -63,6 +63,7 @@
 #include <sys/syslog.h>
 #include <sys/unistd.h>
 #include <machine/cpu.h>
+#include <vm/uma.h>
 
 #include <net/netisr.h>
 #include <net/vnet.h>

Modified: head/sys/netinet/in_proto.c
==============================================================================
--- head/sys/netinet/in_proto.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netinet/in_proto.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/domain.h>
 #include <sys/proc.h>

Modified: head/sys/netinet/tcp_lro.c
==============================================================================
--- head/sys/netinet/tcp_lro.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netinet/tcp_lro.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/socket.h>
 
 #include <net/if.h>

Modified: head/sys/netinet/toecore.c
==============================================================================
--- head/sys/netinet/toecore.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netinet/toecore.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/types.h>

Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netinet6/in6_proto.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/domain.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>

Modified: head/sys/netinet6/send.c
==============================================================================
--- head/sys/netinet6/send.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netinet6/send.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/priv.h>

Modified: head/sys/netipsec/ipsec_mbuf.c
==============================================================================
--- head/sys/netipsec/ipsec_mbuf.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netipsec/ipsec_mbuf.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -34,6 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 

Modified: head/sys/netipsec/key_debug.c
==============================================================================
--- head/sys/netipsec/key_debug.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netipsec/key_debug.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -36,10 +36,10 @@
 #include "opt_ipsec.h"
 #endif
 
-#include <sys/types.h>
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #endif

Modified: head/sys/netpfil/ipfw/ip_fw_log.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_log.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/netpfil/ipfw/ip_fw_log.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -39,8 +39,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>

Modified: head/sys/rpc/replay.c
==============================================================================
--- head/sys/rpc/replay.c	Mon Feb  1 15:40:40 2016	(r295125)
+++ head/sys/rpc/replay.c	Mon Feb  1 17:41:21 2016	(r295126)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/hash.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>