4 files changed, 16 insertions, 2 deletions
diff --git a/source/components/namespace/nsdump.c b/source/components/namespace/nsdump.c
index 5559d9a9e41a..4f6a7f99467f 100644
--- a/source/components/namespace/nsdump.c
+++ b/source/components/namespace/nsdump.c
@@ -748,6 +748,13 @@ AcpiNsDumpOneObjectPath (
     }
 
     Node = AcpiNsValidateHandle (ObjHandle);
+    if (!Node)
+    {
+        /* Ignore bad node during namespace walk */
+
+        return (AE_OK);
+    }
+
     Pathname = AcpiNsGetExternalPathname (Node);
 
     PathIndent = 1;
diff --git a/source/components/namespace/nsxfeval.c b/source/components/namespace/nsxfeval.c
index 007ade31bd8a..a1af583a6001 100644
--- a/source/components/namespace/nsxfeval.c
+++ b/source/components/namespace/nsxfeval.c
@@ -44,6 +44,7 @@
 
 
 #define __NSXFEVAL_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"
@@ -148,8 +149,12 @@ AcpiEvaluateObjectTyped (
 
     if (MustFree)
     {
-        /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
-
+        /*
+         * Caller used ACPI_ALLOCATE_BUFFER, free the return buffer.
+         * Note: We use AcpiOsFree here because AcpiOsAllocate was used
+         * to allocate the buffer. This purposefully bypasses the internal
+         * allocation tracking mechanism (if it is enabled).
+         */
         AcpiOsFree (ReturnBuffer->Pointer);
         ReturnBuffer->Pointer = NULL;
     }
diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c
index 289ecd812f54..5ef49c4dd492 100644
--- a/source/components/namespace/nsxfname.c
+++ b/source/components/namespace/nsxfname.c
@@ -43,6 +43,7 @@
  */
 
 #define __NSXFNAME_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"
diff --git a/source/components/namespace/nsxfobj.c b/source/components/namespace/nsxfobj.c
index 96c5111f3355..d3adfdb242b2 100644
--- a/source/components/namespace/nsxfobj.c
+++ b/source/components/namespace/nsxfobj.c
@@ -44,6 +44,7 @@
 
 
 #define __NSXFOBJ_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"