diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 39a0f71a0803..1160add535f2 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -48,7 +48,8 @@ SRCS+=	OsdDebug.c
 SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=	OsdStream.c OsdSynch.c OsdTable.c OsdEnvironment.c 
 SRCS+=	opt_acpi.h opt_bus.h opt_ddb.h
-SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h
+SRCS+=	acpi_if.h bus_if.h device_if.h
+SRCS+=	isa_if.h pci_if.h pcib_if.h
 
 # Debugging support
 DBSRC=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c
diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile
index 3d8d3b82937a..08470d02571c 100644
--- a/sys/modules/acpi/acpi_asus/Makefile
+++ b/sys/modules/acpi/acpi_asus/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=		acpi_asus
 CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
-SRCS=		acpi_asus.c opt_acpi.h device_if.h bus_if.h
+SRCS=		acpi_asus.c opt_acpi.h acpi_if.h bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile
index d70ba63ec8bc..b974b15aa380 100644
--- a/sys/modules/acpi/acpi_toshiba/Makefile
+++ b/sys/modules/acpi/acpi_toshiba/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=		acpi_toshiba
 CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
-SRCS=		acpi_toshiba.c opt_acpi.h device_if.h bus_if.h
+SRCS=		acpi_toshiba.c opt_acpi.h acpi_if.h bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile
index 5519971fa237..2ad8524bb18b 100644
--- a/sys/modules/acpi/acpi_video/Makefile
+++ b/sys/modules/acpi/acpi_video/Makefile
@@ -2,7 +2,7 @@
 #	$FreeBSD$
 KMOD=	acpi_video
 SRCS=	acpi_video.c
-SRCS+=	opt_acpi.h bus_if.h device_if.h
+SRCS+=	opt_acpi.h acpi_if.h bus_if.h device_if.h
 NOMAN=
 
 .PATH: ${.CURDIR}/../../../dev/acpica