diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile
--- a/sys/modules/dpaa2/Makefile
+++ b/sys/modules/dpaa2/Makefile
@@ -21,12 +21,10 @@
 SRCS+=	pcib_if.h pci_if.h
 SRCS+=	opt_acpi.h opt_platform.h
 
-.if !empty(OPT_ACPI)
-SRCS+=	dpaa2_mc_acpi.c \
+SRCS.DEV_ACPI=	dpaa2_mc_acpi.c \
 	memac_mdio_acpi.c \
 	acpi_if.h \
 	acpi_bus_if.h
-.endif
 
 .if !empty(OPT_FDT)
 SRCS+=	dpaa2_mc_fdt.c \
diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile
--- a/sys/modules/hwpmc/Makefile
+++ b/sys/modules/hwpmc/Makefile
@@ -12,10 +12,8 @@
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 SRCS+=	hwpmc_arm64.c hwpmc_arm64_md.c
-.if !empty(OPT_ACPI)
-SRCS+=	cmn600.c hwpmc_cmn600.c
-SRCS+=	hwpmc_dmc620.c pmu_dmc620.c
-.endif
+SRCS.DEV_ACPI=	cmn600.c hwpmc_cmn600.c
+SRCS.DEV_ACPI+=	hwpmc_dmc620.c pmu_dmc620.c
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"