5 files changed, 9 insertions, 12 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
index 7c614b558c..bbf262d517 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include "ComponentName.h"
+#include "InternalIsaBus.h"
 
 //
 // EFI Component Name Protocol
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
index c198d870c6..301142698b 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _COMPONENT_NAME_H_
 #define _COMPONENT_NAME_H_
 
-#include "InternalIsaBus.h"
-
 extern EFI_COMPONENT_NAME_PROTOCOL   gIsaBusComponentName;
 extern EFI_COMPONENT_NAME2_PROTOCOL  gIsaBusComponentName2;
 
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
index ad2f945d47..672e449cf9 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaBus.h
@@ -16,8 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _INTERNAL_ISA_BUS_H_
 
 
-#include <PiDxe.h>
-#include <FrameworkDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/PciIo.h>
 #include <Protocol/ComponentName.h>
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
index e189ed7576..8cf9ac9c2c 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBus.c
@@ -522,8 +522,8 @@ IsaBusControllerDriverStop (
                       );
 
       if (!EFI_ERROR (Status)) {
-        gBS->FreePool (IsaIoDevice->DevicePath);
-        gBS->FreePool (IsaIoDevice);
+        FreePool (IsaIoDevice->DevicePath);
+        FreePool (IsaIoDevice);
       } else {
         //
         // Re-open PCI IO Protocol on behalf of the child device
@@ -660,10 +660,10 @@ Done:
 
   if (EFI_ERROR (Status)) {
     if (IsaIoDevice->DevicePath != NULL) {
-      gBS->FreePool (IsaIoDevice->DevicePath);
+      FreePool (IsaIoDevice->DevicePath);
     }
 
-    gBS->FreePool (IsaIoDevice);
+    FreePool (IsaIoDevice);
   }
 
   return Status;
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index 99295f48c4..815fa6bcab 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -387,7 +387,7 @@ IsaIoUnmap (
     // Free the mapped buffer and the MAP_INFO structure.
     //
     gBS->FreePages (IsaMapInfo->MappedHostAddress, IsaMapInfo->NumberOfPages);
-    gBS->FreePool (IsaMapInfo);
+    FreePool (IsaMapInfo);
   }
 
   return EFI_SUCCESS;
@@ -822,7 +822,7 @@ IsaIoMapOnlySupportSlaveReadWrite (
                     &IsaMapInfo->MappedHostAddress
                     );
     if (EFI_ERROR (Status)) {
-      gBS->FreePool (IsaMapInfo);
+      FreePool (IsaMapInfo);
       *NumberOfBytes  = 0;
       *Mapping        = NULL;
       return Status;
@@ -1129,7 +1129,7 @@ IsaIoMapFullSupport (
                     &IsaMapInfo->MappedHostAddress
                     );
     if (EFI_ERROR (Status)) {
-      gBS->FreePool (IsaMapInfo);
+      FreePool (IsaMapInfo);
       *NumberOfBytes  = 0;
       *Mapping        = NULL;
       return Status;