diff --git a/source/include/acapps.h b/source/include/acapps.h
index 458ba4d6d..154593f8f 100644
--- a/source/include/acapps.h
+++ b/source/include/acapps.h
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -128,12 +128,12 @@ extern UINT32                   AmlLength;
 
 
 extern int                      AcpiGbl_Optind;
-extern NATIVE_CHAR              *AcpiGbl_Optarg;
+extern char                     *AcpiGbl_Optarg;
 
 int
 AcpiGetopt(
-    int                     argc, 
-    char                    **argv, 
+    int                     argc,
+    char                    **argv,
     char                    *opts);
 
 ACPI_STATUS
@@ -171,16 +171,18 @@ void
 AdDumpTables (void);
 
 ACPI_STATUS
-AdGetTables (
+AdGetLocalTables (
     char                    *Filename,
     BOOLEAN                 GetAllTables);
 
 ACPI_STATUS
-AdParseTables (void);
+AdParseTable (
+    ACPI_TABLE_HEADER       *Table);
 
 ACPI_STATUS
 AdDisplayTables (
-    char                    *Filename);
+    char                    *Filename,
+    ACPI_TABLE_HEADER       *Table);
 
 ACPI_STATUS
 AdDisplayStatistics (void);
diff --git a/source/include/acdebug.h b/source/include/acdebug.h
index 78f0de7f4..e4c828947 100644
--- a/source/include/acdebug.h
+++ b/source/include/acdebug.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdebug.h - ACPI/AML debugger
- *       $Revision: 1.63 $
+ *       $Revision: 1.67 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -122,7 +122,7 @@
 
 typedef struct CommandInfo
 {
-    NATIVE_CHAR             *Name;          /* Command Name */
+    char                    *Name;          /* Command Name */
     UINT8                   MinArgs;        /* Minimum arguments required */
 
 } COMMAND_INFO;
@@ -130,7 +130,7 @@ typedef struct CommandInfo
 
 typedef struct ArgumentInfo
 {
-    NATIVE_CHAR             *Name;          /* Argument Name */
+    char                    *Name;          /* Argument Name */
 
 } ARGUMENT_INFO;
 
@@ -174,16 +174,16 @@ AcpiDbSingleStep (
 
 void
 AcpiDbDisplayTableInfo (
-    NATIVE_CHAR             *TableArg);
+    char                    *TableArg);
 
 void
 AcpiDbUnloadAcpiTable (
-    NATIVE_CHAR             *TableArg,
-    NATIVE_CHAR             *InstanceArg);
+    char                    *TableArg,
+    char                    *InstanceArg);
 
 void
 AcpiDbSetMethodBreakpoint (
-    NATIVE_CHAR             *Location,
+    char                    *Location,
     ACPI_WALK_STATE         *WalkState,
     ACPI_PARSE_OBJECT       *Op);
 
@@ -193,46 +193,46 @@ AcpiDbSetMethodCallBreakpoint (
 
 void
 AcpiDbDisassembleAml (
-    NATIVE_CHAR             *Statements,
+    char                    *Statements,
     ACPI_PARSE_OBJECT       *Op);
 
 void
 AcpiDbDumpNamespace (
-    NATIVE_CHAR             *StartArg,
-    NATIVE_CHAR             *DepthArg);
+    char                    *StartArg,
+    char                    *DepthArg);
 
 void
 AcpiDbDumpNamespaceByOwner (
-    NATIVE_CHAR             *OwnerArg,
-    NATIVE_CHAR             *DepthArg);
+    char                    *OwnerArg,
+    char                    *DepthArg);
 
 void
 AcpiDbSendNotify (
-    NATIVE_CHAR             *Name,
+    char                    *Name,
     UINT32                  Value);
 
 void
 AcpiDbSetMethodData (
-    NATIVE_CHAR             *TypeArg,
-    NATIVE_CHAR             *IndexArg,
-    NATIVE_CHAR             *ValueArg);
+    char                    *TypeArg,
+    char                    *IndexArg,
+    char                    *ValueArg);
 
 ACPI_STATUS
 AcpiDbDisplayObjects (
-    NATIVE_CHAR             *ObjTypeArg,
-    NATIVE_CHAR             *DisplayCountArg);
+    char                    *ObjTypeArg,
+    char                    *DisplayCountArg);
 
 ACPI_STATUS
 AcpiDbFindNameInNamespace (
-    NATIVE_CHAR             *NameArg);
+    char                    *NameArg);
 
 void
 AcpiDbSetScope (
-    NATIVE_CHAR             *Name);
+    char                    *Name);
 
 void
 AcpiDbFindReferences (
-    NATIVE_CHAR             *ObjectArg);
+    char                    *ObjectArg);
 
 void
 AcpiDbDisplayLocks (void);
@@ -240,7 +240,7 @@ AcpiDbDisplayLocks (void);
 
 void
 AcpiDbDisplayResources (
-    NATIVE_CHAR             *ObjectArg);
+    char                    *ObjectArg);
 
 void
 AcpiDbCheckIntegrity (
@@ -285,8 +285,12 @@ AcpiDbDisplayMethodInfo (
 
 void
 AcpiDbDecodeAndDisplayObject (
-    NATIVE_CHAR             *Target,
-    NATIVE_CHAR             *OutputType);
+    char                    *Target,
+    char                    *OutputType);
+
+void
+AcpiDbDecodeNode (
+    ACPI_NAMESPACE_NODE     *Node);
 
 void
 AcpiDbDisplayResultObject (
@@ -295,7 +299,7 @@ AcpiDbDisplayResultObject (
 
 ACPI_STATUS
 AcpiDbDisplayAllMethods (
-    NATIVE_CHAR             *DisplayCountArg);
+    char                    *DisplayCountArg);
 
 void
 AcpiDbDisplayInternalObject (
@@ -342,15 +346,15 @@ AcpiDbDecodeInternalObject (
 
 void
 AcpiDbExecute (
-    NATIVE_CHAR             *Name,
-    NATIVE_CHAR             **Args,
+    char                    *Name,
+    char                    **Args,
     UINT32                  Flags);
 
 void
 AcpiDbCreateExecutionThreads (
-    NATIVE_CHAR             *NumThreadsArg,
-    NATIVE_CHAR             *NumLoopsArg,
-    NATIVE_CHAR             *MethodNameArg);
+    char                    *NumThreadsArg,
+    char                    *NumLoopsArg,
+    char                    *MethodNameArg);
 
 ACPI_STATUS
 AcpiDbExecuteMethod (
@@ -376,7 +380,7 @@ AcpiDbMethodThread (
 
 ACPI_OBJECT_TYPE
 AcpiDbMatchArgument (
-    NATIVE_CHAR             *UserArgument,
+    char                    *UserArgument,
     ARGUMENT_INFO           *Arguments);
 
 ACPI_STATUS
@@ -389,15 +393,21 @@ AcpiDbCloseDebugFile (
 
 void
 AcpiDbOpenDebugFile (
-    NATIVE_CHAR             *Name);
+    char                    *Name);
 
 ACPI_STATUS
 AcpiDbLoadAcpiTable (
-    NATIVE_CHAR             *Filename);
+    char                    *Filename);
 
 ACPI_STATUS
-AcpiDbGetAcpiTable (
-    NATIVE_CHAR             *Filename);
+AcpiDbGetTableFromFile (
+    char                    *Filename,
+    ACPI_TABLE_HEADER       **Table);
+
+ACPI_STATUS
+AcpiDbReadTableFromFile (
+    char                    *Filename,
+    ACPI_TABLE_HEADER       **Table);
 
 /*
  * dbhistry - debugger HISTORY command
@@ -405,14 +415,14 @@ AcpiDbGetAcpiTable (
 
 void
 AcpiDbAddToHistory (
-    NATIVE_CHAR             *CommandLine);
+    char                    *CommandLine);
 
 void
 AcpiDbDisplayHistory (void);
 
-NATIVE_CHAR *
+char *
 AcpiDbGetFromHistory (
-    NATIVE_CHAR             *CommandNumArg);
+    char                    *CommandNumArg);
 
 
 /*
@@ -421,7 +431,7 @@ AcpiDbGetFromHistory (
 
 ACPI_STATUS
 AcpiDbCommandDispatch (
-    NATIVE_CHAR             *InputBuffer,
+    char                    *InputBuffer,
     ACPI_WALK_STATE         *WalkState,
     ACPI_PARSE_OBJECT       *Op);
 
@@ -431,25 +441,25 @@ AcpiDbExecuteThread (
 
 ACPI_STATUS
 AcpiDbUserCommands (
-    NATIVE_CHAR             Prompt,
+    char                    Prompt,
     ACPI_PARSE_OBJECT       *Op);
 
 void
 AcpiDbDisplayHelp (
-    NATIVE_CHAR             *HelpType);
+    char                    *HelpType);
 
-NATIVE_CHAR *
+char *
 AcpiDbGetNextToken (
-    NATIVE_CHAR             *String,
-    NATIVE_CHAR             **Next);
+    char                    *String,
+    char                    **Next);
 
 UINT32
 AcpiDbGetLine (
-    NATIVE_CHAR             *InputBuffer);
+    char                    *InputBuffer);
 
 UINT32
 AcpiDbMatchCommand (
-    NATIVE_CHAR             *UserCommand);
+    char                    *UserCommand);
 
 void
 AcpiDbSingleThread (
@@ -468,7 +478,7 @@ AcpiDbGenerateStatistics (
 
 ACPI_STATUS
 AcpiDbDisplayStatistics (
-    NATIVE_CHAR             *TypeArg);
+    char                    *TypeArg);
 
 ACPI_STATUS
 AcpiDbClassifyOneObject (
@@ -505,7 +515,7 @@ AcpiDbDumpObject (
 
 void
 AcpiDbPrepNamestring (
-    NATIVE_CHAR             *Name);
+    char                    *Name);
 
 
 ACPI_STATUS
@@ -514,7 +524,7 @@ AcpiDbSecondPassParse (
 
 ACPI_NAMESPACE_NODE *
 AcpiDbLocalNsLookup (
-    NATIVE_CHAR             *Name);
+    char                    *Name);
 
 
 #endif  /* __ACDEBUG_H__ */