5 files changed, 7 insertions, 0 deletions
diff --git a/source/components/events/evgpe.c b/source/components/events/evgpe.c
index 9b80f08d214a..08286065b17b 100644
--- a/source/components/events/evgpe.c
+++ b/source/components/events/evgpe.c
@@ -549,6 +549,7 @@ AcpiEvAsynchExecuteGpeMethod (
     Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS);
     if (ACPI_FAILURE (Status))
     {
+        ACPI_FREE (LocalGpeEventInfo);
         return_VOID;
     }
 
@@ -557,6 +558,7 @@ AcpiEvAsynchExecuteGpeMethod (
     if (!AcpiEvValidGpeEvent (GpeEventInfo))
     {
         Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
+        ACPI_FREE (LocalGpeEventInfo);
         return_VOID;
     }
 
@@ -570,6 +572,7 @@ AcpiEvAsynchExecuteGpeMethod (
     Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
     if (ACPI_FAILURE (Status))
     {
+        ACPI_FREE (LocalGpeEventInfo);
         return_VOID;
     }
 
diff --git a/source/components/events/evxface.c b/source/components/events/evxface.c
index 0e8393097afb..9bce5248b1b1 100644
--- a/source/components/events/evxface.c
+++ b/source/components/events/evxface.c
@@ -43,6 +43,7 @@
 
 
 #define __EVXFACE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"
diff --git a/source/components/events/evxfevnt.c b/source/components/events/evxfevnt.c
index ae3378e2c00f..ce1ce4d0e9e8 100644
--- a/source/components/events/evxfevnt.c
+++ b/source/components/events/evxfevnt.c
@@ -43,6 +43,7 @@
 
 
 #define __EVXFEVNT_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"
diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c
index 1deff5be88a5..e76b7f1ed336 100644
--- a/source/components/events/evxfgpe.c
+++ b/source/components/events/evxfgpe.c
@@ -43,6 +43,7 @@
 
 
 #define __EVXFGPE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"
diff --git a/source/components/events/evxfregn.c b/source/components/events/evxfregn.c
index 4b5b3d03ffe4..5879da68b9b2 100644
--- a/source/components/events/evxfregn.c
+++ b/source/components/events/evxfregn.c
@@ -43,6 +43,7 @@
  */
 
 #define __EVXFREGN_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include "acpi.h"
 #include "accommon.h"