--- osunixxf.c	1 Nov 2005 18:58:28 -0000
+++ osunixxf.c	1 Nov 2005 20:10:01 -0000
@@ -130,6 +130,8 @@
 #include "acparser.h"
 #include "acdebug.h"
 
+#include "compiler/aslcompiler.h"
+
 #define _COMPONENT          ACPI_OS_SERVICES
         ACPI_MODULE_NAME    ("osunixxf")
 
--- debugger/dbfileio.c	1 Nov 2005 18:58:27 -0000
+++ debugger/dbfileio.c	1 Nov 2005 20:10:01 -0000
@@ -140,6 +140,8 @@
 
 /* Local prototypes */
 
+#ifdef ACPI_APPLICATION
+
 static ACPI_STATUS
 AcpiDbCheckTextModeCorruption (
     UINT8                   *Table,
@@ -150,6 +152,7 @@
 AeLocalLoadTable (
     ACPI_TABLE_HEADER       *TablePtr);
 
+#endif
 
 /*******************************************************************************
  *
--- utilities/utalloc.c	1 Nov 2005 18:58:28 -0000
+++ utilities/utalloc.c	1 Nov 2005 20:10:01 -0000
@@ -123,6 +123,7 @@
 
 /* Local prototypes */
 
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
 static ACPI_DEBUG_MEM_BLOCK *
 AcpiUtFindAllocation (
     void                    *Allocation);
@@ -143,7 +144,6 @@
     char                    *Module,
     UINT32                  Line);
 
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
 static ACPI_STATUS
 AcpiUtCreateList (
     char                    *ListName,