diff --git a/sys/conf/config.mk b/sys/conf/config.mk
--- a/sys/conf/config.mk
+++ b/sys/conf/config.mk
@@ -13,6 +13,13 @@
 	@echo "#define SMP 1" >> ${.TARGET}
 	@echo "#define MAC 1" >> ${.TARGET}
 	@echo "#define VIMAGE 1" >> ${.TARGET}
+# Note: Define 'options' in DEFAULTS to 1. For simplicity, no check if the
+# option is in opt_global.h. Nearly all the options in DEFAUlTS today are in
+# opt_global.h with GEOM_* being the main exceptions. Move any options from
+# GENERIC or std.* files to DEFAULTS to get this treatment for untied builds.
+	@awk '$$1 == "options" && $$2 !~ "GEOM_" { print "#define ", $$2, " 1"; }' \
+		< ${SYSDIR}/${MACHINE}/conf/DEFAULTS \
+		>>  ${.TARGET}
 .if ${MK_BHYVE_SNAPSHOT} != "no"
 opt_bhyve_snapshot.h:
 	@echo "#define BHYVE_SNAPSHOT 1" > ${.TARGET}