diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
index 6fe64a611900..39b4a48497b4 100644
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -1,97 +1,100 @@
 DEVIWLWIFIDIR=	${SRCTOP}/sys/contrib/dev/iwlwifi
 
 .PATH: ${DEVIWLWIFIDIR}
 
 WITH_CONFIG_PM=	0
 WITH_DEBUGFS=	0
+.if ${KERN_OPTS:MDEV_ACPI}
 WITH_CONFIG_ACPI=	1
+.endif
 
 KMOD=	if_iwlwifi
 
 SRCS=	iwl-dbg-tlv.c iwl-drv.c iwl-debug.c iwl-devtrace.c iwl-io.c
 SRCS+=	iwl-nvm-parse.c iwl-nvm-utils.c iwl-trans.c iwl-phy-db.c
 SRCS+=	iwl-utils.c
 
 SRCS+=	cfg/22000.c cfg/7000.c cfg/8000.c cfg/9000.c cfg/ax210.c
 SRCS+=	cfg/bz.c cfg/sc.c cfg/dr.c
 SRCS+=	cfg/rf-fm.c cfg/rf-gf.c cfg/rf-hr.c cfg/rf-jf.c cfg/rf-pe.c
 SRCS+=	cfg/rf-wh.c
 
 SRCS+=	fw/dbg.c fw/dump.c fw/img.c fw/init.c
 SRCS+=	fw/notif-wait.c fw/paging.c fw/pnvm.c fw/regulatory.c fw/rs.c
 SRCS+=	fw/smem.c
 #SRCS+=	fw/uefi.c
 
 SRCS+=	pcie/ctxt-info-v2.c pcie/ctxt-info.c pcie/drv.c pcie/utils.c
 SRCS+=	pcie/gen1_2/rx.c pcie/gen1_2/trans-gen2.c pcie/gen1_2/trans.c
 SRCS+=	pcie/gen1_2/tx-gen2.c pcie/gen1_2/tx.c
 
 SRCS+=	mvm/binding.c mvm/coex.c
 SRCS+=	mvm/ftm-initiator.c mvm/ftm-responder.c mvm/fw.c
 #SRCS+=	mvm/led.c
 SRCS+=	mvm/link.c mvm/mac-ctxt.c mvm/mac80211.c mvm/mld-key.c
 SRCS+=	mvm/mld-mac.c mvm/mld-mac80211.c mvm/mld-sta.c mvm/nvm.c
 SRCS+=	mvm/offloading.c mvm/ops.c mvm/phy-ctxt.c mvm/power.c mvm/ptp.c
 SRCS+=	mvm/quota.c mvm/rfi.c mvm/rs-fw.c mvm/rs.c mvm/rx.c mvm/rxmq.c
 SRCS+=	mvm/scan.c mvm/sf.c mvm/sta.c mvm/tdls.c mvm/time-event.c
 SRCS+=	mvm/time-sync.c mvm/tt.c mvm/tx.c mvm/utils.c
 
 SRCS+=	mld/agg.c mld/ap.c mld/coex.c
 SRCS+=	mld/ftm-initiator.c mld/fw.c mld/iface.c mld/key.c
 #SRCS+=	mld/led.c
 SRCS+=	mld/link.c mld/low_latency.c mld/mac80211.c mld/mcc.c mld/mld.c
 SRCS+=	mld/mlo.c mld/notif.c mld/phy.c mld/power.c mld/ptp.c
 SRCS+=	mld/regulatory.c mld/roc.c mld/rx.c mld/scan.c
 SRCS+=	mld/session-protect.c mld/sta.c mld/stats.c mld/thermal.c
 SRCS+=	mld/time_sync.c mld/tlc.c mld/tx.c
 
 .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0
 SRCS+=	fw/debugfs.c
 SRCS+=	mvm/debugfs.c mvm/debugfs-vif.c
 SRCS+=	mld/debugfs.c
 CFLAGS+=	-DCONFIG_IWLWIFI_DEBUGFS
 CFLAGS+=	-DCONFIG_MAC80211_DEBUGFS
 .endif
 .if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0
 SRCS+=	mvm/d3.c
 SRCS+=	mld/d3.c
 CFLAGS+=	-DCONFIG_PM
 CFLAGS+=	-DCONFIG_PM_SLEEP
 .endif
 
 .if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0
-SRCS+=	fw/acpi.c
+SRCS.DEV_ACPI+=	fw/acpi.c
 CFLAGS+=	-DCONFIG_ACPI
-CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI
 .endif
+# This needs to always stay on for the LinuxKPI header file.
+CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI
 
 # Other
 SRCS+=	${LINUXKPI_GENSRCS}
 SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h
 
 CFLAGS+=	-DKBUILD_MODNAME='"iwlwifi"'
 CFLAGS+=	-DLINUXKPI_VERSION=61700
 
 CFLAGS+=	-I${DEVIWLWIFIDIR}
 CFLAGS+=	${LINUXKPI_INCLUDES}
 CFLAGS+=	-DCONFIG_IWLDVM=0
 CFLAGS+=	-DCONFIG_IWLMVM=1
 CFLAGS+=	-DCONFIG_IWLMLD=1
 # Helpful after fresh imports.
 #CFLAGS+=	-ferror-limit=0
 
 #CFLAGS+=	-DCONFIG_INET=1		# Need LKPI TSO implementation.
 #CFLAGS+=	-DCONFIG_IPV6=1
 CFLAGS+=	-DCONFIG_IWLWIFI_DEBUG=1
 #CFLAGS+=	-DCONFIG_IWLWIFI_LEDS=1
 #CFLAGS+=	-DCONFIG_IWLWIFI_OPMODE_MODULAR=1
 CFLAGS+=	-DCONFIG_IWLWIFI_DEVICE_TRACING=1
 #CFLAGS+=	-DCONFIG_LOCKDEP=1
 #CFLAGS+=	-DCONFIG_NL80211_TESTMODE=1
 #CFLAGS+=	-DCONFIG_THERMAL=1
 #CFLAGS+=	-DCONFIG_EFI=1
 
 CWARNFLAGS.clang.drv.c+=	-Wno-initializer-overrides
 CWARNFLAGS.drv.c+=		-Wno-override-init ${CWARNFLAGS.${COMPILER_TYPE}.${.IMPSRC:T}}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile
index 1307abf3d9b4..98174fff2a1b 100644
--- a/sys/modules/rtw89/Makefile
+++ b/sys/modules/rtw89/Makefile
@@ -1,58 +1,67 @@
 DEVRTW89DIR=	${SRCTOP}/sys/contrib/dev/rtw89
 
 .PATH: ${DEVRTW89DIR}
 
 WITH_CONFIG_PM=	0
 WITH_DEBUGFS=	0
+.if ${KERN_OPTS:MDEV_ACPI}
+WITH_CONFIG_ACPI=	1
+.endif
 
 KMOD=	if_rtw89
 
 SRCS=	core.c
 SRCS+=	pci.c pci_be.c
 SRCS+=	chan.c mac80211.c mac.c mac_be.c phy.c phy_be.c fw.c
-SRCS+=	acpi.c cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c
+SRCS+=	cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c
 SRCS+=	util.c
 SRCS+=	rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c
 SRCS+=	rtw8852ae.c
 SRCS+=	rtw8852c.c rtw8852c_rfk.c rtw8852c_rfk_table.c rtw8852c_table.c
 SRCS+=	rtw8852ce.c
 SRCS+=	rtw8851b.c rtw8851b_rfk.c rtw8851b_rfk_table.c rtw8851b_table.c
 SRCS+=	rtw8851be.c
 SRCS+=	rtw8852b_common.c
 SRCS+=	rtw8852b.c rtw8852b_rfk.c rtw8852b_rfk_table.c rtw8852b_table.c
 SRCS+=	rtw8852be.c
 SRCS+=	rtw8852bt.c rtw8852bt_rfk.c rtw8852bt_rfk_table.c
 SRCS+=	rtw8852bte.c
 SRCS+=	rtw8922a.c rtw8922a_rfk.c
 SRCS+=	rtw8922ae.c
 
+.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0
+SRCS.DEV_ACPI+=	acpi.c
+CFLAGS+=	-DCONFIG_ACPI
+.endif
+# This needs to always stay on for the LinuxKPI header file.
+CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI
+
 # USB parts
 #SRCS+=	rtw8851bu.c rtw8852bu.c
 #SRCS+=	usb.c
 
 # CONFIG_RTW89_DEBUG (always on for now)
 SRCS+=	debug.c
 
 .if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0
 CFLAGS+=	-DCONFIG_PM=${WITH_CONFIG_PM}
 SRCS+=	wow.c
 .endif
 
 # Other
 SRCS+=	${LINUXKPI_GENSRCS}
 SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h
 
 CFLAGS+=	-DKBUILD_MODNAME='"rtw89"'
 CFLAGS+=	-DLINUXKPI_VERSION=61700
-CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI
 
 CFLAGS+=	-I${DEVRTW89DIR}
 CFLAGS+=	${LINUXKPI_INCLUDES}
 CFLAGS+=	-DCONFIG_RTW89_DEBUGMSG
 .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0
 CFLAGS+=	-DCONFIG_RTW89_DEBUGFS
 .endif
 
 #CFLAGS+=	-ferror-limit=0
 
 .include <bsd.kmod.mk>