diff --git a/source/include/actypes.h b/source/include/actypes.h
index c61a18b44..8e2e1f480 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: actypes.h - Common data types for the entire ACPI subsystem
- *       $Revision: 1.166 $
+ *       $Revision: 1.167 $
  *
  *****************************************************************************/
 
@@ -586,7 +586,7 @@ typedef union AcpiObj
     {
         ACPI_OBJECT_TYPE            Type;
         UINT32                      ProcId;
-        UINT32                      PblkAddress;
+        ACPI_IO_ADDRESS             PblkAddress;
         UINT32                      PblkLength;
     } Processor;
 
@@ -618,7 +618,7 @@ typedef struct AcpiObjList
 
 typedef struct
 {
-    UINT32                      Length;         /* Length in bytes of the buffer */
+    NATIVE_UINT                 Length;         /* Length in bytes of the buffer */
     void                        *Pointer;       /* pointer to buffer */
 
 } ACPI_BUFFER;
diff --git a/source/include/acutils.h b/source/include/acutils.h
index b97d17a99..a2b13bc9f 100644
--- a/source/include/acutils.h
+++ b/source/include/acutils.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: accommon.h -- prototypes for the common (subsystem-wide) procedures
- *       $Revision: 1.89 $
+ *       $Revision: 1.91 $
  *
  *****************************************************************************/
 
@@ -256,7 +256,7 @@ AcpiCmStrncat (
     const NATIVE_CHAR       *SrcString,
     NATIVE_UINT             Count);
 
-UINT32
+NATIVE_UINT
 AcpiCmStrtoul (
     const NATIVE_CHAR       *String,
     NATIVE_CHAR             **Terminator,
@@ -695,11 +695,15 @@ ACPI_STATUS
 AcpiCmResolvePackageReferences (
     ACPI_OPERAND_OBJECT     *ObjDesc);
 
+#ifdef ACPI_DEBUG
+
 void
 AcpiCmDisplayInitPathname (
     ACPI_HANDLE             ObjHandle,
     char                    *Path);
 
+#endif
+
 
 /*
  * Memory allocation functions and related macros.