12 files changed, 11 insertions, 18 deletions
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index ef47f0fb59b4..b14fb8a05e38 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -856,7 +856,7 @@ METHOD int get_cpus {
 	device_t	_child;
 	enum cpu_sets	_op;
 	size_t		_setsize;
-	cpuset_t	*_cpuset;
+	struct _cpuset	*_cpuset;
 } DEFAULT bus_generic_get_cpus;
 
 /**
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 03a8fc56cb1c..6a18850f1107 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/epoch.h>
+#include <sys/eventhandler.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
@@ -160,11 +161,6 @@ SET_DECLARE(sysinit_set, struct sysinit);
 struct sysinit **sysinit, **sysinit_end;
 struct sysinit **newsysinit, **newsysinit_end;
 
-EVENTHANDLER_LIST_DECLARE(process_init);
-EVENTHANDLER_LIST_DECLARE(thread_init);
-EVENTHANDLER_LIST_DECLARE(process_ctor);
-EVENTHANDLER_LIST_DECLARE(thread_ctor);
-
 /*
  * Merge a new sysinit set into the current set, reallocating it if
  * necessary.  This can only be called after malloc is running.
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 4f820f3e3453..47cdce455bc3 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/epoch.h>
+#include <sys/eventhandler.h>
 #include <sys/gtaskqueue.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 61ec0507e855..56f2f398d043 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -145,8 +145,6 @@ static int map_at_zero = 0;
 SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RWTUN, &map_at_zero, 0,
     "Permit processes to map an object at virtual address 0.");
 
-EVENTHANDLER_LIST_DECLARE(process_exec);
-
 static int
 sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
 {
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 5027182875d5..e805a4362b83 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -99,8 +99,6 @@ SDT_PROBE_DEFINE1(proc, , , exit, "int");
 /* Hook for NFS teardown procedure. */
 void (*nlminfo_release_p)(struct proc *p);
 
-EVENTHANDLER_LIST_DECLARE(process_exit);
-
 struct proc *
 proc_realparent(struct proc *child)
 {
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 910bd935822a..78becdba74f9 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -99,8 +99,6 @@ struct fork_args {
 };
 #endif
 
-EVENTHANDLER_LIST_DECLARE(process_fork);
-
 /* ARGSUSED */
 int
 sys_fork(struct thread *td, struct fork_args *uap)
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index cc110a9408c2..14a740332e59 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -155,9 +155,6 @@ EVENTHANDLER_LIST_DEFINE(process_exit);
 EVENTHANDLER_LIST_DEFINE(process_fork);
 EVENTHANDLER_LIST_DEFINE(process_exec);
 
-EVENTHANDLER_LIST_DECLARE(thread_ctor);
-EVENTHANDLER_LIST_DECLARE(thread_dtor);
-
 int kstack_pages = KSTACK_PAGES;
 SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0,
     "Kernel stack size in pages");
diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c
index 01341bdcb311..dbfd66bd2300 100644
--- a/sys/kern/subr_bus_dma.c
+++ b/sys/kern/subr_bus_dma.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
+#include <sys/ktr.h>
 #include <sys/mbuf.h>
 #include <sys/memdesc.h>
 #include <sys/proc.h>
diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
index f3724880c959..a2f82333d457 100644
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index 7b7371f82f3e..2b9e02b820ac 100644
--- a/sys/kern/subr_power.c
+++ b/sys/kern/subr_power.c
@@ -30,10 +30,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-
+#include <sys/eventhandler.h>
 #include <sys/power.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
 #include <sys/taskqueue.h>
 
 static u_int		 power_pm_type	= POWER_PM_TYPE_NONE;
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index b59efb6cb94b..c10dac907498 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c
index 200015b4d016..ece960e6be81 100644
--- a/sys/kern/vfs_mountroot.c
+++ b/sys/kern/vfs_mountroot.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
+#include <sys/eventhandler.h>
 #include <sys/fcntl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>