diff --git a/sys/conf/files b/sys/conf/files
index 5a13acef949f..0da2d6308d19 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -57,16 +57,16 @@ contrib/dev/acpica/Subsystem/Common/cminit.c	optional acpica
 contrib/dev/acpica/Subsystem/Common/cmobject.c	optional acpica
 contrib/dev/acpica/Subsystem/Common/cmutils.c	optional acpica
 contrib/dev/acpica/Subsystem/Common/cmxface.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbcmds.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbdisasm.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbdisply.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbexec.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbfileio.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbhistry.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbinput.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbstats.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbutils.c	optional acpica
-contrib/dev/acpica/Subsystem/Debugger/dbxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbcmds.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbdisasm.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbdisply.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbexec.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbfileio.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbhistry.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbinput.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbstats.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbutils.c	optional acpica acpi_debug
+contrib/dev/acpica/Subsystem/Debugger/dbxface.c	optional acpica acpi_debug
 contrib/dev/acpica/Subsystem/Dispatcher/dsfield.c	optional acpica
 contrib/dev/acpica/Subsystem/Dispatcher/dsmethod.c	optional acpica
 contrib/dev/acpica/Subsystem/Dispatcher/dsmthdat.c	optional acpica
@@ -86,7 +86,6 @@ contrib/dev/acpica/Subsystem/Events/evxface.c	optional acpica
 contrib/dev/acpica/Subsystem/Events/evxfevnt.c	optional acpica
 contrib/dev/acpica/Subsystem/Events/evxfregn.c	optional acpica
 contrib/dev/acpica/Subsystem/Hardware/hwacpi.c	optional acpica
-contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c	optional acpica
 contrib/dev/acpica/Subsystem/Hardware/hwgpe.c	optional acpica
 contrib/dev/acpica/Subsystem/Hardware/hwregs.c	optional acpica
 contrib/dev/acpica/Subsystem/Hardware/hwxface.c	optional acpica
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 493fa07734dc..fdc51ff4b5c4 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -82,6 +82,7 @@ compat/svr4/svr4_sysent.c		optional	compat_svr4
 compat/svr4/svr4_sysvec.c		optional	compat_svr4
 compat/svr4/svr4_termios.c		optional	compat_svr4
 compat/svr4/svr4_ttold.c		optional	compat_svr4
+contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c	optional acpica
 contrib/dev/fla/fla.c		optional	fla
 contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 406e0c1b426e..34e52b3644a0 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -58,6 +58,7 @@ ia64/ia64/userconfig.c		optional	userconfig
 ia64/ia64/vm_machdep.c		standard
 ia64/isa/isa.c			optional	isa
 ia64/isa/isa_dma.c		optional	isa
+contrib/dev/acpica/Subsystem/Hardware/hwcpu64.c	optional acpica
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/fb/fb.c			optional	fb