diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
index 65acd0c37e..2b639c9bb8 100644
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
@@ -53,7 +53,7 @@ ExtendedIfrSupportLibConstructor (
 
 
 
-STATIC EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;
 
 /**
   Extract formset class for given HII handle.
@@ -170,7 +170,7 @@ IfrLibExtractClassFromHiiHandle (
     Offset += PackageHeader.Length;
   }
 
-  gBS->FreePool (HiiPackageList);
+  FreePool (HiiPackageList);
 
   return EFI_SUCCESS;
 }
diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
index ea9079ea0f..ae8956afdb 100644
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
@@ -264,7 +264,7 @@ UpdateFormPackageData (
 
 Fail:
   if (!Updated) {
-    gBS->FreePool (*TempBuffer);
+    FreePool (*TempBuffer);
     *TempBufferSize = 0;
     return EFI_NOT_FOUND;
   }
@@ -335,7 +335,7 @@ IfrLibUpdateForm (
 
     Status = HiiDatabase->ExportPackageLists (HiiDatabase, Handle, &BufferSize, HiiPackageList);
     if (EFI_ERROR (Status)) {
-      gBS->FreePool (HiiPackageList);
+      FreePool (HiiPackageList);
       return Status;
     }
   }
@@ -370,7 +370,7 @@ IfrLibUpdateForm (
           }
           CopyMem (UpdateBufferPos, TempBuffer, TempBufferSize);
           UpdateBufferPos += TempBufferSize;
-          gBS->FreePool (TempBuffer);
+          FreePool (TempBuffer);
           continue;
         }
       }
@@ -380,7 +380,7 @@ IfrLibUpdateForm (
     } else if (Status == EFI_NOT_FOUND) {
       break;
     } else {
-      gBS->FreePool (HiiPackageList);
+      FreePool (HiiPackageList);
       return Status;
     }
   }
@@ -391,7 +391,7 @@ IfrLibUpdateForm (
   BufferSize = UpdateBufferPos - (UINT8 *) UpdateBuffer;
   CopyMem (&UpdateBuffer->PackageLength, &BufferSize, sizeof (UINT32));
 
-  gBS->FreePool (HiiPackageList);
+  FreePool (HiiPackageList);
 
   return HiiDatabase->UpdatePackageList (HiiDatabase, Handle, UpdateBuffer);
 }
diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c
index 1a9926e23b..4329774330 100644
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "LibraryInternal.h"
 
-STATIC EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;
-
 /**
   Create GUIDed opcode for banner. Banner opcode
   EFI_IFR_EXTEND_OP_BANNER is extended opcode specific
diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
index 2ec3f5e4a9..bbc3a9023a 100644
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
@@ -33,4 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <MdeModuleHii.h>
 
+extern EFI_GUID mIfrVendorGuid;
+
 #endif