diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c
index 4178e6fe6684..6b2d762613d8 100644
--- a/sys/amd64/amd64/local_apic.c
+++ b/sys/amd64/amd64/local_apic.c
@@ -34,6 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 7c8da2df7fe4..659ba925b84a 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_clock.h"
 #include "opt_cpu.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_ktrace.h"
 
diff --git a/sys/conf/options b/sys/conf/options
index bc7ecd309b35..4121857b3ef3 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -707,4 +707,4 @@ NI4BISPPP		opt_i4b.h
 LOOKUP_SHARED		opt_vfs.h
 
 # HWPMC options
-HWPMC_HOOKS		opt_global.h
+HWPMC_HOOKS
diff --git a/sys/i386/i386/local_apic.c b/sys/i386/i386/local_apic.c
index 3e9646157adf..df4d1debf477 100644
--- a/sys/i386/i386/local_apic.c
+++ b/sys/i386/i386/local_apic.c
@@ -34,6 +34,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index bb02052c3b5c..7cfa7ceb0889 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_clock.h"
 #include "opt_cpu.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_ktrace.h"
 #include "opt_npx.h"
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 070d459cfc1e..cfcc5747e583 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -37,6 +37,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_hwpmc_hooks.h"
 #include "opt_ntp.h"
 #include "opt_watchdog.h"
 
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 2a4c9abce764..36401809285f 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 #include "opt_mac.h"
 
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 44f3a595d07e..7ba4285f80e8 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -35,6 +35,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_hwpmc_hooks.h"
+
 #define kse td_sched
 
 #include <sys/param.h>
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index fc5c7ab396fc..04c8f48e4a75 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -27,7 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <opt_sched.h>
+#include "opt_hwpmc_hooks.h"
+#include "opt_sched.h"
 
 #define kse td_sched