From owner-svn-src-all@freebsd.org  Mon May 20 00:38:41 2019
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 056EB15970AE;
 Mon, 20 May 2019 00:38:41 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9145E83EA8;
 Mon, 20 May 2019 00:38:40 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44451ECA8;
 Mon, 20 May 2019 00:38:40 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4K0ceOt019997;
 Mon, 20 May 2019 00:38:40 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4K0cNoZ019920;
 Mon, 20 May 2019 00:38:23 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201905200038.x4K0cNoZ019920@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Mon, 20 May 2019 00:38:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r347984 - in head/sys: amd64/vmm/io arm/allwinner
 arm/allwinner/a10 arm/allwinner/clkng arm/arm arm/broadcom/bcm2835
 arm/freescale/imx arm/mv arm/mv/armada arm/nvidia arm/nvidia/tegra12...
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: in head/sys: amd64/vmm/io arm/allwinner arm/allwinner/a10
 arm/allwinner/clkng arm/arm arm/broadcom/bcm2835 arm/freescale/imx arm/mv
 arm/mv/armada arm/nvidia arm/nvidia/tegra124 arm/ti arm/versatile ar...
X-SVN-Commit-Revision: 347984
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 9145E83EA8
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0];
 NEURAL_HAM_SHORT(-0.96)[-0.957,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
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, 20 May 2019 00:38:41 -0000

Author: cem
Date: Mon May 20 00:38:23 2019
New Revision: 347984
URL: https://svnweb.freebsd.org/changeset/base/347984

Log:
  Extract eventfilter declarations to sys/_eventfilter.h
  
  This allows replacing "sys/eventfilter.h" includes with "sys/_eventfilter.h"
  in other header files (e.g., sys/{bus,conf,cpu}.h) and reduces header
  pollution substantially.
  
  EVENTHANDLER_DECLARE and EVENTHANDLER_LIST_DECLAREs were moved out of .c
  files into appropriate headers (e.g., sys/proc.h, powernv/opal.h).
  
  As a side effect of reduced header pollution, many .c files and headers no
  longer contain needed definitions.  The remainder of the patch addresses
  adding appropriate includes to fix those files.
  
  LOCK_DEBUG and LOCK_FILE_LINE_ARG are moved to sys/_lock.h, as required by
  sys/mutex.h since r326106 (but silently protected by header pollution prior
  to this change).
  
  No functional change (intended).  Of course, any out of tree modules that
  relied on header pollution for sys/eventhandler.h, sys/lock.h, or
  sys/mutex.h inclusion need to be fixed.  __FreeBSD_version has been bumped.

Added:
  head/sys/sys/_eventhandler.h   (contents, props changed)
Modified:
  head/sys/amd64/vmm/io/iommu.c
  head/sys/arm/allwinner/a10/a10_intc.c
  head/sys/arm/allwinner/a10_dmac.c
  head/sys/arm/allwinner/a31_dmac.c
  head/sys/arm/allwinner/aw_ccu.c
  head/sys/arm/allwinner/aw_reset.c
  head/sys/arm/allwinner/aw_rsb.c
  head/sys/arm/allwinner/aw_spi.c
  head/sys/arm/allwinner/aw_thermal.c
  head/sys/arm/allwinner/aw_wdog.c
  head/sys/arm/allwinner/clkng/aw_ccung.c
  head/sys/arm/arm/machdep.c
  head/sys/arm/arm/pl190.c
  head/sys/arm/broadcom/bcm2835/bcm2835_rng.c
  head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
  head/sys/arm/broadcom/bcm2835/bcm2836.c
  head/sys/arm/freescale/imx/imx_wdog.c
  head/sys/arm/mv/armada/thermal.c
  head/sys/arm/mv/armada/wdt.c
  head/sys/arm/mv/mv_spi.c
  head/sys/arm/mv/timer.c
  head/sys/arm/nvidia/tegra124/tegra124_machdep.c
  head/sys/arm/nvidia/tegra124/tegra124_pmc.c
  head/sys/arm/nvidia/tegra_xhci.c
  head/sys/arm/ti/ti_pruss.c
  head/sys/arm/ti/ti_wdt.c
  head/sys/arm/versatile/versatile_pci.c
  head/sys/arm/versatile/versatile_sic.c
  head/sys/arm64/arm64/gicv3_its.c
  head/sys/arm64/arm64/machdep.c
  head/sys/arm64/coresight/coresight.c
  head/sys/arm64/rockchip/clk/rk_cru.c
  head/sys/cam/cam_periph.h
  head/sys/cam/ctl/ctl_ha.c
  head/sys/cddl/compat/opensolaris/kern/opensolaris.c
  head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
  head/sys/crypto/aesni/aesni.c
  head/sys/crypto/armv8/armv8_crypto.c
  head/sys/crypto/blake2/blake2_cryptodev.c
  head/sys/crypto/ccp/ccp.c
  head/sys/crypto/ccp/ccp_hardware.c
  head/sys/ddb/db_command.c
  head/sys/dev/acpi_support/acpi_panasonic.c
  head/sys/dev/acpica/acpi.c
  head/sys/dev/acpica/acpi_lid.c
  head/sys/dev/acpica/acpi_thermal.c
  head/sys/dev/acpica/acpi_video.c
  head/sys/dev/acpica/acpivar.h
  head/sys/dev/adb/adb_kbd.c
  head/sys/dev/adb/adb_mouse.c
  head/sys/dev/amdsbwd/amdsbwd.c
  head/sys/dev/atkbdc/psm.c
  head/sys/dev/cardbus/cardbus.c
  head/sys/dev/cmx/cmx.c
  head/sys/dev/coretemp/coretemp.c
  head/sys/dev/cxgbe/cxgbei/cxgbei.c
  head/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
  head/sys/dev/cxgbe/tom/t4_tls.c
  head/sys/dev/dcons/dcons_crom.c
  head/sys/dev/dcons/dcons_os.c
  head/sys/dev/dcons/dcons_os.h
  head/sys/dev/evdev/evdev_private.h
  head/sys/dev/extres/syscon/syscon_generic.c
  head/sys/dev/firewire/firewire.c
  head/sys/dev/firewire/fwohci.c
  head/sys/dev/ichwd/ichwd.c
  head/sys/dev/ida/ida_disk.c
  head/sys/dev/ida/ida_pci.c
  head/sys/dev/iir/iir_ctrl.c
  head/sys/dev/ioat/ioat.c
  head/sys/dev/ipmi/ipmi.c
  head/sys/dev/ipmi/ipmi_opal.c
  head/sys/dev/ips/ips.c
  head/sys/dev/iscsi/icl_soft_proxy.c
  head/sys/dev/iscsi_initiator/iscsivar.h
  head/sys/dev/iwm/if_iwm_notif_wait.c
  head/sys/dev/led/led.c
  head/sys/dev/liquidio/lio_bsd.h
  head/sys/dev/mfi/mfi_disk.c
  head/sys/dev/mfi/mfi_pci.c
  head/sys/dev/mfi/mfi_syspd.c
  head/sys/dev/mlx/mlxvar.h
  head/sys/dev/mmc/host/dwmmc.c
  head/sys/dev/mpr/mprvar.h
  head/sys/dev/mps/mpsvar.h
  head/sys/dev/mrsas/mrsas.h
  head/sys/dev/nmdm/nmdm.c
  head/sys/dev/ntb/if_ntb/if_ntb.c
  head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
  head/sys/dev/ow/ow.c
  head/sys/dev/pccard/pccard.c
  head/sys/dev/pci/pci.c
  head/sys/dev/pci/pci_iov.c
  head/sys/dev/pci/pci_pci.c
  head/sys/dev/pci/pcivar.h
  head/sys/dev/scc/scc_core.c
  head/sys/dev/scc/scc_dev_quicc.c
  head/sys/dev/scc/scc_dev_sab82532.c
  head/sys/dev/scc/scc_dev_z8530.c
  head/sys/dev/smartpqi/smartpqi_includes.h
  head/sys/dev/sound/pcm/sound.h
  head/sys/dev/tws/tws.h
  head/sys/dev/usb/net/if_cdce.c
  head/sys/dev/usb/net/if_usie.c
  head/sys/dev/usb/net/uhso.c
  head/sys/dev/usb/serial/u3g.c
  head/sys/dev/usb/usb_device.c
  head/sys/dev/usb/usbdi.h
  head/sys/dev/usb/wlan/if_run.c
  head/sys/dev/viawd/viawd.c
  head/sys/dev/vkbd/vkbd.c
  head/sys/dev/vmware/vmci/vmci.c
  head/sys/dev/vt/vt_cpulogos.c
  head/sys/dev/vt/vt_sysmouse.c
  head/sys/dev/watchdog/watchdog.c
  head/sys/dev/xdma/xdma.c
  head/sys/dev/xdma/xdma_bank.c
  head/sys/dev/xdma/xdma_bio.c
  head/sys/dev/xdma/xdma_mbuf.c
  head/sys/dev/xdma/xdma_queue.c
  head/sys/dev/xdma/xdma_sg.c
  head/sys/dev/xen/console/xen_console.c
  head/sys/dev/xen/debug/debug.c
  head/sys/fs/devfs/devfs_vnops.c
  head/sys/i386/i386/elan-mmcr.c
  head/sys/i386/i386/geode.c
  head/sys/i386/i386/longrun.c
  head/sys/kern/bus_if.m
  head/sys/kern/init_main.c
  head/sys/kern/kern_clock.c
  head/sys/kern/kern_exec.c
  head/sys/kern/kern_exit.c
  head/sys/kern/kern_fork.c
  head/sys/kern/kern_proc.c
  head/sys/kern/subr_bus_dma.c
  head/sys/kern/subr_intr.c
  head/sys/kern/subr_power.c
  head/sys/kern/tty_tty.c
  head/sys/kern/vfs_mountroot.c
  head/sys/mips/atheros/ar71xx_machdep.c
  head/sys/mips/atheros/ar71xx_wdog.c
  head/sys/net/bpf.c
  head/sys/net/bpf.h
  head/sys/net/bpf_buffer.c
  head/sys/net/ethernet.h
  head/sys/net/if.c
  head/sys/net/if_clone.h
  head/sys/net/if_llatbl.c
  head/sys/net/if_llatbl.h
  head/sys/net/if_tuntap.c
  head/sys/net/if_var.h
  head/sys/net/if_vlan_var.h
  head/sys/netinet/if_ether.c
  head/sys/netinet/tcp_offload.c
  head/sys/netinet/toecore.c
  head/sys/netinet/toecore.h
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6_nbr.c
  head/sys/powerpc/ofw/ofw_machdep.c
  head/sys/powerpc/powermac/cpcht.c
  head/sys/powerpc/powermac/cuda.c
  head/sys/powerpc/powermac/pmu.c
  head/sys/powerpc/powermac/smu.c
  head/sys/powerpc/powermac/vcoregpio.c
  head/sys/powerpc/powernv/opal.h
  head/sys/powerpc/powernv/opal_async.c
  head/sys/powerpc/powernv/opal_console.c
  head/sys/powerpc/powernv/opal_dev.c
  head/sys/powerpc/powernv/opal_flash.c
  head/sys/powerpc/powernv/opal_sensor.c
  head/sys/powerpc/powernv/xive.c
  head/sys/powerpc/powerpc/cpu.c
  head/sys/powerpc/powerpc/openpic.c
  head/sys/powerpc/ps3/ps3bus.c
  head/sys/powerpc/pseries/rtas_dev.c
  head/sys/powerpc/pseries/xics.c
  head/sys/riscv/riscv/intr_machdep.c
  head/sys/riscv/riscv/machdep.c
  head/sys/riscv/riscv/mp_machdep.c
  head/sys/security/audit/audit.c
  head/sys/security/audit/audit_trigger.c
  head/sys/sys/_lock.h
  head/sys/sys/bus.h
  head/sys/sys/conf.h
  head/sys/sys/cpu.h
  head/sys/sys/eventhandler.h
  head/sys/sys/interrupt.h
  head/sys/sys/lock.h
  head/sys/sys/param.h
  head/sys/sys/pcpu.h
  head/sys/sys/power.h
  head/sys/sys/proc.h
  head/sys/sys/watchdog.h
  head/sys/vm/swap_pager.c
  head/sys/x86/acpica/OsdEnvironment.c
  head/sys/x86/cpufreq/smist.c
  head/sys/x86/iommu/intel_drv.c
  head/sys/x86/iommu/intel_intrmap.c
  head/sys/x86/iommu/intel_quirks.c
  head/sys/x86/x86/tsc.c

Modified: head/sys/amd64/vmm/io/iommu.c
==============================================================================
--- head/sys/amd64/vmm/io/iommu.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/amd64/vmm/io/iommu.c	Mon May 20 00:38:23 2019	(r347984)
@@ -32,10 +32,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
-#include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/sysctl.h>
+#include <sys/systm.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/arm/allwinner/a10/a10_intc.c
==============================================================================
--- head/sys/arm/allwinner/a10/a10_intc.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/a10/a10_intc.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,11 +30,12 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_platform.h"
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpuset.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
+#include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/param.h>

Modified: head/sys/arm/allwinner/a10_dmac.c
==============================================================================
--- head/sys/arm/allwinner/a10_dmac.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/a10_dmac.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/condvar.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 
 #include <machine/bus.h>
 

Modified: head/sys/arm/allwinner/a31_dmac.c
==============================================================================
--- head/sys/arm/allwinner/a31_dmac.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/a31_dmac.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/condvar.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/endian.h>
 
 #include <machine/bus.h>

Modified: head/sys/arm/allwinner/aw_ccu.c
==============================================================================
--- head/sys/arm/allwinner/aw_ccu.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/aw_ccu.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <machine/bus.h>
 
 #include <dev/fdt/simplebus.h>

Modified: head/sys/arm/allwinner/aw_reset.c
==============================================================================
--- head/sys/arm/allwinner/aw_reset.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/aw_reset.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <machine/bus.h>
 
 #include <dev/ofw/ofw_bus.h>

Modified: head/sys/arm/allwinner/aw_rsb.c
==============================================================================
--- head/sys/arm/allwinner/aw_rsb.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/aw_rsb.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <machine/bus.h>
 
 #include <dev/ofw/ofw_bus.h>

Modified: head/sys/arm/allwinner/aw_spi.c
==============================================================================
--- head/sys/arm/allwinner/aw_spi.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/aw_spi.c	Mon May 20 00:38:23 2019	(r347984)
@@ -32,7 +32,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/resource.h>
 #include <machine/bus.h>

Modified: head/sys/arm/allwinner/aw_thermal.c
==============================================================================
--- head/sys/arm/allwinner/aw_thermal.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/aw_thermal.c	Mon May 20 00:38:23 2019	(r347984)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>

Modified: head/sys/arm/allwinner/aw_wdog.c
==============================================================================
--- head/sys/arm/allwinner/aw_wdog.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/aw_wdog.c	Mon May 20 00:38:23 2019	(r347984)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/watchdog.h>
 #include <sys/reboot.h>

Modified: head/sys/arm/allwinner/clkng/aw_ccung.c
==============================================================================
--- head/sys/arm/allwinner/clkng/aw_ccung.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/allwinner/clkng/aw_ccung.c	Mon May 20 00:38:23 2019	(r347984)
@@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <machine/bus.h>
 
 #include <dev/fdt/simplebus.h>

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/arm/machdep.c	Mon May 20 00:38:23 2019	(r347984)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/imgact.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/linker.h>
 #include <sys/msgbuf.h>
 #include <sys/reboot.h>

Modified: head/sys/arm/arm/pl190.c
==============================================================================
--- head/sys/arm/arm/pl190.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/arm/pl190.c	Mon May 20 00:38:23 2019	(r347984)
@@ -34,7 +34,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_rng.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_rng.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_rng.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c	Mon May 20 00:38:23 2019	(r347984)
@@ -29,12 +29,15 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/watchdog.h>
 #include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
+#include <sys/systm.h>
+#include <sys/watchdog.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

Modified: head/sys/arm/broadcom/bcm2835/bcm2836.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2836.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/broadcom/bcm2835/bcm2836.c	Mon May 20 00:38:23 2019	(r347984)
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/cpuset.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
 #ifdef SMP

Modified: head/sys/arm/freescale/imx/imx_wdog.c
==============================================================================
--- head/sys/arm/freescale/imx/imx_wdog.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/freescale/imx/imx_wdog.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,13 +33,16 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
-#include <sys/time.h>
-#include <sys/bus.h>
+#include <sys/mutex.h>
 #include <sys/resource.h>
 #include <sys/rman.h>
+#include <sys/systm.h>
+#include <sys/time.h>
 #include <sys/watchdog.h>
 
 #include <machine/bus.h>

Modified: head/sys/arm/mv/armada/thermal.c
==============================================================================
--- head/sys/arm/mv/armada/thermal.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/mv/armada/thermal.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,9 +33,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/rman.h>
-#include <sys/types.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/resource.h>
 
 #include <machine/fdt.h>

Modified: head/sys/arm/mv/armada/wdt.c
==============================================================================
--- head/sys/arm/mv/armada/wdt.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/mv/armada/wdt.c	Mon May 20 00:38:23 2019	(r347984)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/malloc.h>

Modified: head/sys/arm/mv/mv_spi.c
==============================================================================
--- head/sys/arm/mv/mv_spi.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/mv/mv_spi.c	Mon May 20 00:38:23 2019	(r347984)
@@ -32,7 +32,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 
 #include <machine/bus.h>

Modified: head/sys/arm/mv/timer.c
==============================================================================
--- head/sys/arm/mv/timer.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/mv/timer.c	Mon May 20 00:38:23 2019	(r347984)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/malloc.h>

Modified: head/sys/arm/nvidia/tegra124/tegra124_machdep.c
==============================================================================
--- head/sys/arm/nvidia/tegra124/tegra124_machdep.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/nvidia/tegra124/tegra124_machdep.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,10 +30,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/reboot.h>
 #include <sys/devmap.h>
+#include <sys/lock.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
 
 #include <vm/vm.h>
 

Modified: head/sys/arm/nvidia/tegra124/tegra124_pmc.c
==============================================================================
--- head/sys/arm/nvidia/tegra124/tegra124_pmc.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/nvidia/tegra124/tegra124_pmc.c	Mon May 20 00:38:23 2019	(r347984)
@@ -27,12 +27,14 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
-#include <sys/module.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
+#include <sys/systm.h>
 
 #include <machine/bus.h>
 

Modified: head/sys/arm/nvidia/tegra_xhci.c
==============================================================================
--- head/sys/arm/nvidia/tegra_xhci.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/nvidia/tegra_xhci.c	Mon May 20 00:38:23 2019	(r347984)
@@ -34,15 +34,17 @@ __FBSDID("$FreeBSD$");
 #include "opt_platform.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/clock.h>
 #include <sys/condvar.h>
 #include <sys/firmware.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
+#include <sys/systm.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>

Modified: head/sys/arm/ti/ti_pruss.c
==============================================================================
--- head/sys/arm/ti/ti_pruss.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/ti/ti_pruss.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,8 +38,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>

Modified: head/sys/arm/ti/ti_wdt.c
==============================================================================
--- head/sys/arm/ti/ti_wdt.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/ti/ti_wdt.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/malloc.h>

Modified: head/sys/arm/versatile/versatile_pci.c
==============================================================================
--- head/sys/arm/versatile/versatile_pci.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/versatile/versatile_pci.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,8 +33,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
-#include <sys/module.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/watchdog.h>
 

Modified: head/sys/arm/versatile/versatile_sic.c
==============================================================================
--- head/sys/arm/versatile/versatile_sic.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm/versatile/versatile_sic.c	Mon May 20 00:38:23 2019	(r347984)
@@ -34,7 +34,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>

Modified: head/sys/arm64/arm64/gicv3_its.c
==============================================================================
--- head/sys/arm64/arm64/gicv3_its.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm64/arm64/gicv3_its.c	Mon May 20 00:38:23 2019	(r347984)
@@ -42,8 +42,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/cpuset.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/rman.h>

Modified: head/sys/arm64/arm64/machdep.c
==============================================================================
--- head/sys/arm64/arm64/machdep.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm64/arm64/machdep.c	Mon May 20 00:38:23 2019	(r347984)
@@ -42,8 +42,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/efi.h>
 #include <sys/exec.h>
 #include <sys/imgact.h>
-#include <sys/kdb.h> 
+#include <sys/kdb.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/limits.h>
 #include <sys/linker.h>
 #include <sys/msgbuf.h>

Modified: head/sys/arm64/coresight/coresight.c
==============================================================================
--- head/sys/arm64/coresight/coresight.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm64/coresight/coresight.c	Mon May 20 00:38:23 2019	(r347984)
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <machine/bus.h>
 
 #include <dev/ofw/ofw_bus.h>

Modified: head/sys/arm64/rockchip/clk/rk_cru.c
==============================================================================
--- head/sys/arm64/rockchip/clk/rk_cru.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/arm64/rockchip/clk/rk_cru.c	Mon May 20 00:38:23 2019	(r347984)
@@ -40,7 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <machine/bus.h>
 
 #include <dev/fdt/simplebus.h>

Modified: head/sys/cam/cam_periph.h
==============================================================================
--- head/sys/cam/cam_periph.h	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/cam/cam_periph.h	Mon May 20 00:38:23 2019	(r347984)
@@ -37,6 +37,8 @@
 #include <cam/cam_sim.h>
 
 #ifdef _KERNEL
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 

Modified: head/sys/cam/ctl/ctl_ha.c
==============================================================================
--- head/sys/cam/ctl/ctl_ha.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/cam/ctl/ctl_ha.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,23 +30,23 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/condvar.h>
+#include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/types.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/condvar.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/conf.h>
 #include <sys/queue.h>
-#include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
 #include <sys/uio.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris.c	Mon May 20 00:38:23 2019	(r347984)
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/cpuvar.h>
 #include <sys/errno.h>

Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Mon May 20 00:38:23 2019	(r347984)
@@ -25,6 +25,7 @@ static const char rcsid[] = "@(#)$Id$";
 # include "opt_random_ip_id.h"
 #endif
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/types.h>

Modified: head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
==============================================================================
--- head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c	Mon May 20 00:38:23 2019	(r347984)
@@ -178,7 +178,6 @@ static const char *const ioctl_names[] = {
 vchiq_static_assert((sizeof(ioctl_names)/sizeof(ioctl_names[0])) ==
 	(VCHIQ_IOC_MAX + 1));
 
-static eventhandler_tag vchiq_ehtag = NULL;
 static d_open_t		vchiq_open;
 static d_close_t	vchiq_close;
 static d_ioctl_t	vchiq_ioctl;
@@ -2918,9 +2917,6 @@ void vchiq_exit(void);
 void
 vchiq_exit(void)
 {
-	if (vchiq_ehtag == NULL)
-		EVENTHANDLER_DEREGISTER(dev_clone, vchiq_ehtag);
-	vchiq_ehtag = NULL;
 
 	vchiq_platform_exit(&g_state);
 	if (vchiq_cdev) {

Modified: head/sys/crypto/aesni/aesni.c
==============================================================================
--- head/sys/crypto/aesni/aesni.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/crypto/aesni/aesni.c	Mon May 20 00:38:23 2019	(r347984)
@@ -35,17 +35,18 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/kobj.h>
 #include <sys/libkern.h>
 #include <sys/lock.h>
-#include <sys/module.h>
 #include <sys/malloc.h>
-#include <sys/bus.h>
-#include <sys/uio.h>
 #include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/smp.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
 
 #include <crypto/aesni/aesni.h>
 #include <crypto/aesni/sha_sse.h>

Modified: head/sys/crypto/armv8/armv8_crypto.c
==============================================================================
--- head/sys/crypto/armv8/armv8_crypto.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/crypto/armv8/armv8_crypto.c	Mon May 20 00:38:23 2019	(r347984)
@@ -45,9 +45,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/rwlock.h>
 #include <sys/smp.h>

Modified: head/sys/crypto/blake2/blake2_cryptodev.c
==============================================================================
--- head/sys/crypto/blake2/blake2_cryptodev.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/crypto/blake2/blake2_cryptodev.c	Mon May 20 00:38:23 2019	(r347984)
@@ -32,8 +32,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/kobj.h>
 #include <sys/lock.h>
-#include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rwlock.h>
 #include <sys/smp.h>
 

Modified: head/sys/crypto/ccp/ccp.c
==============================================================================
--- head/sys/crypto/ccp/ccp.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/crypto/ccp/ccp.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>

Modified: head/sys/crypto/ccp/ccp_hardware.c
==============================================================================
--- head/sys/crypto/ccp/ccp_hardware.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/crypto/ccp/ccp_hardware.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>

Modified: head/sys/ddb/db_command.c
==============================================================================
--- head/sys/ddb/db_command.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/ddb/db_command.c	Mon May 20 00:38:23 2019	(r347984)
@@ -37,6 +37,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/linker_set.h>
 #include <sys/lock.h>
 #include <sys/kdb.h>

Modified: head/sys/dev/acpi_support/acpi_panasonic.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_panasonic.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/acpi_support/acpi_panasonic.c	Mon May 20 00:38:23 2019	(r347984)
@@ -31,10 +31,11 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/bus.h>
 #include <sys/power.h>
 
 #include <contrib/dev/acpica/include/acpi.h>

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/acpica/acpi.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_acpi.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/fcntl.h>

Modified: head/sys/dev/acpica/acpi_lid.c
==============================================================================
--- head/sys/dev/acpica/acpi_lid.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/acpica/acpi_lid.c	Mon May 20 00:38:23 2019	(r347984)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>

Modified: head/sys/dev/acpica/acpi_thermal.c
==============================================================================
--- head/sys/dev/acpica/acpi_thermal.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/acpica/acpi_thermal.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>

Modified: head/sys/dev/acpica/acpi_video.c
==============================================================================
--- head/sys/dev/acpica/acpi_video.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/acpica/acpi_video.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,10 +30,11 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/bus.h>
 #include <sys/power.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>

Modified: head/sys/dev/acpica/acpivar.h
==============================================================================
--- head/sys/dev/acpica/acpivar.h	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/acpica/acpivar.h	Mon May 20 00:38:23 2019	(r347984)
@@ -35,7 +35,7 @@
 
 #include "acpi_if.h"
 #include "bus_if.h"
-#include <sys/eventhandler.h>
+#include <sys/_eventhandler.h>
 #ifdef INTRNG
 #include <sys/intr.h>
 #endif

Modified: head/sys/dev/adb/adb_kbd.c
==============================================================================
--- head/sys/dev/adb/adb_kbd.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/adb/adb_kbd.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,7 +30,9 @@
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kbio.h>

Modified: head/sys/dev/adb/adb_mouse.c
==============================================================================
--- head/sys/dev/adb/adb_mouse.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/adb/adb_mouse.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,7 +30,9 @@
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/mouse.h>

Modified: head/sys/dev/amdsbwd/amdsbwd.c
==============================================================================
--- head/sys/dev/amdsbwd/amdsbwd.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/amdsbwd/amdsbwd.c	Mon May 20 00:38:23 2019	(r347984)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_amdsbwd.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/systm.h>

Modified: head/sys/dev/atkbdc/psm.c
==============================================================================
--- head/sys/dev/atkbdc/psm.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/atkbdc/psm.c	Mon May 20 00:38:23 2019	(r347984)
@@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/filio.h>
+#include <sys/mutex.h>
 #include <sys/poll.h>
 #include <sys/sigio.h>
 #include <sys/signalvar.h>

Modified: head/sys/dev/cardbus/cardbus.c
==============================================================================
--- head/sys/dev/cardbus/cardbus.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/cardbus/cardbus.c	Mon May 20 00:38:23 2019	(r347984)
@@ -31,6 +31,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/module.h>

Modified: head/sys/dev/cmx/cmx.c
==============================================================================
--- head/sys/dev/cmx/cmx.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/cmx/cmx.c	Mon May 20 00:38:23 2019	(r347984)
@@ -41,7 +41,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/mutex.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/poll.h>

Modified: head/sys/dev/coretemp/coretemp.c
==============================================================================
--- head/sys/dev/coretemp/coretemp.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/coretemp/coretemp.c	Mon May 20 00:38:23 2019	(r347984)
@@ -36,14 +36,15 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/systm.h>
-#include <sys/types.h>
-#include <sys/module.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>	/* for curthread */
 #include <sys/sched.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
 
 #include <machine/specialreg.h>
 #include <machine/cpufunc.h>

Modified: head/sys/dev/cxgbe/cxgbei/cxgbei.c
==============================================================================
--- head/sys/dev/cxgbe/cxgbei/cxgbei.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/cxgbe/cxgbei/cxgbei.c	Mon May 20 00:38:23 2019	(r347984)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/module.h>
 #include <sys/systm.h>
 

Modified: head/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
==============================================================================
--- head/sys/dev/cxgbe/cxgbei/icl_cxgbei.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/cxgbe/cxgbei/icl_cxgbei.c	Mon May 20 00:38:23 2019	(r347984)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/file.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>

Modified: head/sys/dev/cxgbe/tom/t4_tls.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_tls.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/cxgbe/tom/t4_tls.c	Mon May 20 00:38:23 2019	(r347984)
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/ktr.h>
 #include <sys/sglist.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

Modified: head/sys/dev/dcons/dcons_crom.c
==============================================================================
--- head/sys/dev/dcons/dcons_crom.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/dcons/dcons_crom.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,6 +38,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/systm.h>

Modified: head/sys/dev/dcons/dcons_os.c
==============================================================================
--- head/sys/dev/dcons/dcons_os.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/dcons/dcons_os.c	Mon May 20 00:38:23 2019	(r347984)
@@ -37,6 +37,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kdb.h>
 #include <gdb/gdb.h>
 #include <sys/kernel.h>

Modified: head/sys/dev/dcons/dcons_os.h
==============================================================================
--- head/sys/dev/dcons/dcons_os.h	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/dcons/dcons_os.h	Mon May 20 00:38:23 2019	(r347984)
@@ -36,6 +36,8 @@
  * $FreeBSD$
  */
 
+#include <sys/_eventhandler.h>
+
 typedef void (*dcons_poll_fn)(void *, int);
 EVENTHANDLER_DECLARE(dcons_poll, dcons_poll_fn);
 

Modified: head/sys/dev/evdev/evdev_private.h
==============================================================================
--- head/sys/dev/evdev/evdev_private.h	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/evdev/evdev_private.h	Mon May 20 00:38:23 2019	(r347984)
@@ -32,7 +32,9 @@
 
 #include <sys/bitstring.h>
 #include <sys/kbio.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/selinfo.h>
 #include <sys/sysctl.h>

Modified: head/sys/dev/extres/syscon/syscon_generic.c
==============================================================================
--- head/sys/dev/extres/syscon/syscon_generic.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/extres/syscon/syscon_generic.c	Mon May 20 00:38:23 2019	(r347984)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 
 #include <machine/bus.h>

Modified: head/sys/dev/firewire/firewire.c
==============================================================================
--- head/sys/dev/firewire/firewire.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/firewire/firewire.c	Mon May 20 00:38:23 2019	(r347984)
@@ -38,16 +38,15 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/types.h>
-
+#include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
-#include <sys/module.h>
+#include <sys/kthread.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
+#include <sys/module.h>
 #include <sys/sysctl.h>
-#include <sys/kthread.h>
+#include <sys/systm.h>
 
 #include <sys/kdb.h>
 #include <sys/bus.h>		/* used by smbus and newbus */

Modified: head/sys/dev/firewire/fwohci.c
==============================================================================
--- head/sys/dev/firewire/fwohci.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/firewire/fwohci.c	Mon May 20 00:38:23 2019	(r347984)
@@ -39,6 +39,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/sockio.h>

Modified: head/sys/dev/ichwd/ichwd.c
==============================================================================
--- head/sys/dev/ichwd/ichwd.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ichwd/ichwd.c	Mon May 20 00:38:23 2019	(r347984)
@@ -62,6 +62,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/systm.h>

Modified: head/sys/dev/ida/ida_disk.c
==============================================================================
--- head/sys/dev/ida/ida_disk.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ida/ida_disk.c	Mon May 20 00:38:23 2019	(r347984)
@@ -41,6 +41,8 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 
 #include <machine/bus.h>
 #include <sys/rman.h>

Modified: head/sys/dev/ida/ida_pci.c
==============================================================================
--- head/sys/dev/ida/ida_pci.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ida/ida_pci.c	Mon May 20 00:38:23 2019	(r347984)
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>

Modified: head/sys/dev/iir/iir_ctrl.c
==============================================================================
--- head/sys/dev/iir/iir_ctrl.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/iir/iir_ctrl.c	Mon May 20 00:38:23 2019	(r347984)
@@ -46,16 +46,18 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/endian.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
-#include <sys/stat.h>
 #include <sys/disklabel.h>
+#include <sys/endian.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
+#include <sys/uio.h>
 #include <machine/bus.h>
 
 #include <dev/iir/iir.h>

Modified: head/sys/dev/ioat/ioat.c
==============================================================================
--- head/sys/dev/ioat/ioat.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ioat/ioat.c	Mon May 20 00:38:23 2019	(r347984)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/fail.h>
 #include <sys/ioccom.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>

Modified: head/sys/dev/ipmi/ipmi.c
==============================================================================
--- head/sys/dev/ipmi/ipmi.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ipmi/ipmi.c	Mon May 20 00:38:23 2019	(r347984)
@@ -34,9 +34,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/poll.h>
 #include <sys/reboot.h>
 #include <sys/rman.h>

Modified: head/sys/dev/ipmi/ipmi_opal.c
==============================================================================
--- head/sys/dev/ipmi/ipmi_opal.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ipmi/ipmi_opal.c	Mon May 20 00:38:23 2019	(r347984)
@@ -28,8 +28,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/module.h>
-#include <sys/types.h>
+#include <sys/mutex.h>
 #include <sys/bus.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>

Modified: head/sys/dev/ips/ips.c
==============================================================================
--- head/sys/dev/ips/ips.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/ips/ips.c	Mon May 20 00:38:23 2019	(r347984)
@@ -30,10 +30,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/ips/ipsreg.h>
-#include <dev/ips/ips.h>
+#include <sys/types.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+
+#include <dev/ips/ipsreg.h>
+#include <dev/ips/ips.h>
 
 static d_open_t ips_open;
 static d_close_t ips_close;

Modified: head/sys/dev/iscsi/icl_soft_proxy.c
==============================================================================
--- head/sys/dev/iscsi/icl_soft_proxy.c	Sun May 19 23:56:04 2019	(r347983)
+++ head/sys/dev/iscsi/icl_soft_proxy.c	Mon May 20 00:38:23 2019	(r347984)
@@ -74,9 +74,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/capsicum.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

Modified: head/sys/dev/iscsi_initiator/iscsivar.h
==============================================================================
--- head/sys/dev/iscsi_initiator/iscsivar.h	Sun May 19 23:56:04 2019	(r347983)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***