12 files changed, 21 insertions, 23 deletions
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index e6463e4..f5ebb27 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -8,16 +8,25 @@
 .error "The ACPI module is only for i386"
 .endif
 
-.PATH: ${.CURDIR}/../../../contrib/dev/acpica \
-       ${.CURDIR}/../../../pci \
-       ${.CURDIR}/../../../dev/acpica \
-       ${.CURDIR}/../../../dev/acpica/Osd \
-       ${.CURDIR}/../../../${MACHINE_ARCH}/acpica
+.PATH:	${.CURDIR}/../../../contrib/dev/acpica/debugger \
+	${.CURDIR}/../../../contrib/dev/acpica/disassembler \
+	${.CURDIR}/../../../contrib/dev/acpica/dispatcher \
+	${.CURDIR}/../../../contrib/dev/acpica/events \
+	${.CURDIR}/../../../contrib/dev/acpica/executer \
+	${.CURDIR}/../../../contrib/dev/acpica/hardware \
+	${.CURDIR}/../../../contrib/dev/acpica/namespace \
+	${.CURDIR}/../../../contrib/dev/acpica/parser \
+	${.CURDIR}/../../../contrib/dev/acpica/resources \
+	${.CURDIR}/../../../contrib/dev/acpica/tables \
+	${.CURDIR}/../../../contrib/dev/acpica/utilities \
+	${.CURDIR}/../../../pci \
+	${.CURDIR}/../../../dev/acpica \
+	${.CURDIR}/../../../dev/acpica/Osd \
+	${.CURDIR}/../../../${MACHINE_ARCH}/acpica
 
 KMOD=	acpi
 
 # ACPI CA sources
-CFLAGS+=   -I${.CURDIR}/../../../contrib/dev/acpica
 SRCS+=	dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c
 SRCS+=	dsutils.c dswexec.c dswload.c dswscope.c dswstate.c
 SRCS+=	evevent.c evgpe.c evgpeblk.c evmisc.c evregion.c evrgnini.c evsci.c
@@ -26,17 +35,17 @@ SRCS+=	exconfig.c exconvrt.c excreate.c exdump.c exfield.c exfldio.c exmisc.c
 SRCS+=	exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c
 SRCS+=	exprep.c exregion.c exresnte.c exresolv.c exresop.c exstore.c
 SRCS+=	exstoren.c exstorob.c exsystem.c exutils.c
-SRCS+=	hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c
+SRCS+=	hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c hwvalid.c hwxface.c
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c
-SRCS+=	nsobject.c nsparse.c nssearch.c nsutils.c nswalk.c nsxfeval.c
-SRCS+=	nsxfname.c nsxfobj.c
+SRCS+=	nsobject.c nsparse.c nspredef.c nssearch.c nsutils.c nswalk.c
+SRCS+=	nsxfeval.c nsxfname.c nsxfobj.c
 SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c pstree.c psutils.c
 SRCS+=	pswalk.c psxface.c
 SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c
 SRCS+=	rsmemory.c rsmisc.c rsutils.c rsxface.c
 SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfroot.c
-SRCS+=	utalloc.c utcache.c utclib.c utcopy.c utdebug.c utdelete.c uteval.c
-SRCS+=	utglobal.c utinit.c utmath.c utmisc.c utmutex.c utobject.c utresrc.c
+SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c uteval.c utglobal.c
+SRCS+=	utinit.c utlock.c utmath.c utmisc.c utmutex.c utobject.c utresrc.c
 SRCS+=	utstate.c utxface.c
 
 # OSPM layer and core hardware drivers
diff --git a/sys/modules/acpi/acpi_aiboost/Makefile b/sys/modules/acpi/acpi_aiboost/Makefile
index e33b6d3..e4a96c1 100644
--- a/sys/modules/acpi/acpi_aiboost/Makefile
+++ b/sys/modules/acpi/acpi_aiboost/Makefile
@@ -3,7 +3,6 @@
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 
 KMOD=		acpi_aiboost
-CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=		acpi_aiboost.c opt_acpi.h device_if.h bus_if.h acpi_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile
index da7bcf8..83672d7 100644
--- a/sys/modules/acpi/acpi_asus/Makefile
+++ b/sys/modules/acpi/acpi_asus/Makefile
@@ -3,7 +3,6 @@
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
 KMOD=	acpi_asus
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=	acpi_asus.c opt_acpi.h acpi_if.h bus_if.h device_if.h
 SRCS+= opt_ddb.h
 
diff --git a/sys/modules/acpi/acpi_dock/Makefile b/sys/modules/acpi/acpi_dock/Makefile
index f7287a4..efbb973 100644
--- a/sys/modules/acpi/acpi_dock/Makefile
+++ b/sys/modules/acpi/acpi_dock/Makefile
@@ -2,7 +2,6 @@
 
 .PATH:		${.CURDIR}/../../../dev/acpica
 KMOD=		acpi_dock
-CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=		acpi_dock.c opt_acpi.h device_if.h bus_if.h acpi_if.h
 SRCS+=		opt_ddb.h
 
diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile
index 03bf3c7..b77a225 100644
--- a/sys/modules/acpi/acpi_fujitsu/Makefile
+++ b/sys/modules/acpi/acpi_fujitsu/Makefile
@@ -3,8 +3,7 @@
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
 KMOD=	acpi_fujitsu
-CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support \
-	-I${.CURDIR}/../../../contrib/dev/acpica
+CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support
 SRCS=	acpi_fujitsu.c opt_acpi.h acpi_if.h device_if.h bus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile
index 75c22e7..caf0c2b 100644
--- a/sys/modules/acpi/acpi_ibm/Makefile
+++ b/sys/modules/acpi/acpi_ibm/Makefile
@@ -2,7 +2,6 @@
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 KMOD=		acpi_ibm
-CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=		acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h
 SRCS+=		opt_ddb.h
 
diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile
index 663d3c2..36f8d77 100644
--- a/sys/modules/acpi/acpi_panasonic/Makefile
+++ b/sys/modules/acpi/acpi_panasonic/Makefile
@@ -3,7 +3,6 @@
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
 KMOD=	acpi_panasonic
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=	acpi_panasonic.c opt_acpi.h acpi_if.h bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile
index 3974094..027afef 100644
--- a/sys/modules/acpi/acpi_sony/Makefile
+++ b/sys/modules/acpi/acpi_sony/Makefile
@@ -3,7 +3,6 @@
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 
 KMOD=		acpi_sony
-CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=		acpi_sony.c opt_acpi.h device_if.h bus_if.h acpi_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile
index 24df091..1207015 100644
--- a/sys/modules/acpi/acpi_toshiba/Makefile
+++ b/sys/modules/acpi/acpi_toshiba/Makefile
@@ -3,7 +3,6 @@
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
 KMOD=	acpi_toshiba
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica
 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 77794ee..67d3f08 100644
--- a/sys/modules/acpi/acpi_video/Makefile
+++ b/sys/modules/acpi/acpi_video/Makefile
@@ -3,7 +3,6 @@
 .PATH:	${.CURDIR}/../../../dev/acpica
 
 KMOD=	acpi_video
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=	acpi_video.c
 SRCS+=	opt_acpi.h acpi_if.h bus_if.h device_if.h
 
diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile
index 4e385b4..75b5c86 100644
--- a/sys/modules/cpufreq/Makefile
+++ b/sys/modules/cpufreq/Makefile
@@ -9,7 +9,6 @@ SRCS+=	bus_if.h cpufreq_if.h device_if.h pci_if.h
 
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 .PATH:	${.CURDIR}/../../i386/cpufreq
-CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica
 
 SRCS+=	acpi_if.h opt_acpi.h
 SRCS+=	est.c hwpstate.c p4tcc.c powernow.c
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index d61a307..43b85f5 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -9,7 +9,6 @@ SRCS=	fdc.c fdc_cbus.c
 .PATH:  ${.CURDIR}/../../dev/fdc
 SRCS=	fdc.c fdc_isa.c fdc_pccard.c
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
-CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica
 SRCS+=	opt_acpi.h acpi_if.h fdc_acpi.c
 .endif
 .endif