diff --git a/src/bin/iasl/Jamfile b/src/bin/iasl/Jamfile
index 16982c6050..b21dd05a72 100644
--- a/src/bin/iasl/Jamfile
+++ b/src/bin/iasl/Jamfile
@@ -13,7 +13,7 @@ local compiler_src =
 	aslcompiler.l
 	aslcompiler.y.y
 	aslanalyze.c aslcodegen.c
-	aslcompile.c aslerror.c aslfiles.c asllength.c
+	aslcompile.c aslerror.c aslfiles.c asllength.c aslstartup.c
 	asllisting.c aslload.c asllookup.c aslmain.c aslmap.c aslopcodes.c
 	asloperands.c aslresource.c aslrestype1.c aslrestype2.c
 	asltree.c aslutils.c asltransform.c aslfold.c aslstubs.c aslopt.c
@@ -43,7 +43,7 @@ local common_src =
 ;
 
 local utilities_src =
-	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c utglobal.c utobject.c  utmisc.c utmath.c utmutex.c utresrc.c utstate.c
+	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c utglobal.c utobject.c  utmisc.c utmath.c utmutex.c utresrc.c utstate.c utxface.c utinit.c
 ;
 
 local namespace_src = 
@@ -82,9 +82,9 @@ SEARCH on [ FGristFiles $(disassembler_src)  ] = [ FDirName $(HAIKU_TOP) src add
 SEARCH on [ FGristFiles $(common_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi common ] ;
 SEARCH on [ FGristFiles $(utilities_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi utilities ] ;
 SEARCH on [ FGristFiles $(namespace_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi namespace ] ;
-SEARCH on [ FGristFiles $(parser_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi interpreter parser ] ;
-SEARCH on [ FGristFiles $(dispatcher_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi interpreter dispatcher ] ;
-SEARCH on [ FGristFiles $(executer_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi interpreter executer ] ;
+SEARCH on [ FGristFiles $(parser_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi parser ] ;
+SEARCH on [ FGristFiles $(dispatcher_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi dispatcher ] ;
+SEARCH on [ FGristFiles $(executer_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi executer ] ;
 SEARCH on [ FGristFiles $(tables_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi tables ] ;
 SEARCH on [ FGristFiles dbfileio.c  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi debugger ] ;
 
diff --git a/src/bin/iasl/osunixxf.c b/src/bin/iasl/osunixxf.c
index 246f426cf9..0773b2975a 100644
--- a/src/bin/iasl/osunixxf.c
+++ b/src/bin/iasl/osunixxf.c
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2006, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -471,7 +471,7 @@ AcpiOsMapMemory (
     ACPI_SIZE               length)
 {
 
-    return (ACPI_TO_POINTER ((ACPI_NATIVE_UINT) where));
+    return (ACPI_TO_POINTER ((ACPI_SIZE) where));
 }