diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -1,6 +1,10 @@
 # $FreeBSD$
 # Options specific to AMD64 platform kernels
 
+# Tell the configuration files who we are
+X86			opt_global.h
+AMD64			opt_global.h
+
 AUTO_EOI_1		opt_auto_eoi.h
 AUTO_EOI_2		opt_auto_eoi.h
 BHYVE_SNAPSHOT
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,6 +1,10 @@
 # $FreeBSD$
 # Options specific to the i386 platform kernels
 
+# Tell the configuration files who we are
+X86			opt_global.h
+I386			opt_global.h
+
 AUTO_EOI_1		opt_auto_eoi.h
 AUTO_EOI_2		opt_auto_eoi.h
 BROKEN_KEYBOARD_RESET	opt_reset.h