diff --git a/sys/arm/arm/stdatomic.c b/sys/arm/arm/stdatomic.c
index a2db9f023fe..301e0a63306 100644
--- a/sys/arm/arm/stdatomic.c
+++ b/sys/arm/arm/stdatomic.c
@@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/sysarch.h>
 
-#ifdef _KERNEL
-#include "opt_global.h"
-#endif
-
 /*
  * Executing statements with interrupts disabled.
  */
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_common.c b/sys/arm/broadcom/bcm2835/bcm2835_common.c
index 5c3c2580cbe..a53495765c8 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_common.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_common.c
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_global.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index 0571c55208b..051593abb66 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -38,7 +38,6 @@
 
 #include "opt_ddb.h"
 #include "opt_platform.h"
-#include "opt_global.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/arm/freescale/imx/imx_common.c b/sys/arm/freescale/imx/imx_common.c
index d8fef824394..3b7139c9dd1 100644
--- a/sys/arm/freescale/imx/imx_common.c
+++ b/sys/arm/freescale/imx/imx_common.c
@@ -33,8 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_global.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm/include/asmacros.h b/sys/arm/include/asmacros.h
index 0767e732495..d7f804fa26d 100644
--- a/sys/arm/include/asmacros.h
+++ b/sys/arm/include/asmacros.h
@@ -34,7 +34,6 @@
 #ifdef _KERNEL
 
 #ifdef LOCORE
-#include "opt_global.h"
 
 #ifdef _ARM_ARCH_6
 #define GET_CURTHREAD_PTR(tmp) \
diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c
index 44c22cb2089..d62efc4ca2f 100644
--- a/sys/arm/mv/mv_common.c
+++ b/sys/arm/mv/mv_common.c
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_global.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm/ti/ti_common.c b/sys/arm/ti/ti_common.c
index 983e6f80761..5fb72b7a390 100644
--- a/sys/arm/ti/ti_common.c
+++ b/sys/arm/ti/ti_common.c
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_global.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm/versatile/versatile_common.c b/sys/arm/versatile/versatile_common.c
index 766db9deacc..7a9e42f4f07 100644
--- a/sys/arm/versatile/versatile_common.c
+++ b/sys/arm/versatile/versatile_common.c
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_global.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm/versatile/versatile_machdep.c b/sys/arm/versatile/versatile_machdep.c
index ef531e142e5..2869f1b5d66 100644
--- a/sys/arm/versatile/versatile_machdep.c
+++ b/sys/arm/versatile/versatile_machdep.c
@@ -35,7 +35,6 @@
 
 #include "opt_ddb.h"
 #include "opt_platform.h"
-#include "opt_global.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c
index 6224503f754..526c5465f19 100644
--- a/sys/arm/xilinx/uart_dev_cdnc.c
+++ b/sys/arm/xilinx/uart_dev_cdnc.c
@@ -38,8 +38,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_global.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/arm/xilinx/zy7_machdep.c b/sys/arm/xilinx/zy7_machdep.c
index 5fb5788028c..f7080dc93d6 100644
--- a/sys/arm/xilinx/zy7_machdep.c
+++ b/sys/arm/xilinx/zy7_machdep.c
@@ -33,8 +33,6 @@
  * (v1.4) November 16, 2012.  Xilinx doc UG585.
  */
 
-#include "opt_global.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 201e5d632ce..a749f90c154 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_global.h"
 
 #include "opt_sctp.h"
 
diff --git a/sys/i386/xen/locore.s b/sys/i386/xen/locore.s
index b67046e50ab..7e676846321 100644
--- a/sys/i386/xen/locore.s
+++ b/sys/i386/xen/locore.s
@@ -42,7 +42,6 @@
 #include "opt_bootp.h"
 #include "opt_compat.h"
 #include "opt_nfsroot.h"
-#include "opt_global.h"
 #include "opt_pmap.h"
 
 #include <sys/syscall.h>
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 467ae1cf5cf..d9849081396 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_adaptive_mutexes.h"
 #include "opt_ddb.h"
-#include "opt_global.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
 
diff --git a/sys/mips/mips/stdatomic.c b/sys/mips/mips/stdatomic.c
index a587446a8db..f9fb590eb1b 100644
--- a/sys/mips/mips/stdatomic.c
+++ b/sys/mips/mips/stdatomic.c
@@ -33,10 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stdatomic.h>
 #include <sys/types.h>
 
-#ifdef _KERNEL
-#include "opt_global.h"
-#endif
-
 #if defined(__SYNC_ATOMICS)
 
 /*
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index df5efc02033..a4405ae5941 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
-#include "opt_global.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
diff --git a/sys/xen/gnttab.c b/sys/xen/gnttab.c
index ca6fa3b8863..9ab3145b4fe 100644
--- a/sys/xen/gnttab.c
+++ b/sys/xen/gnttab.c
@@ -13,7 +13,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_global.h"
 #include "opt_pmap.h"
 
 #include <sys/param.h>