diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index 3eb4a53ff1..570dcd8754 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -332,7 +332,7 @@ InitializeFrontPage (
   //
   // Get current language setting
   //
-  HiiLibGetCurrentLanguage (CurrentLang);
+  GetCurrentLanguage (CurrentLang);
 
   //
   // Allocate space for creation of UpdateData Buffer
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index 23b15475da..e3444148d9 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2086,7 +2086,7 @@ HiiStringIdToImage (
   if (Language != NULL) {
     AsciiStrCpy (CurrentLang, (CHAR8 *) Language);
   } else {
-    HiiLibGetCurrentLanguage (CurrentLang);
+    GetCurrentLanguage (CurrentLang);
   }
 
   //
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 4b53e8762d..bbddd0369d 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/IfrSupportLib.h>
-#include <Library/HiiLib.h>
+#include <Library/UefiLib.h>
 #include <Library/PcdLib.h>
 
 #define HII_DATABASE_NOTIFY_GUID \
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index 29cd5b4cc7..d64a3f22cb 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -58,7 +58,7 @@
   BaseMemoryLib
   DebugLib
   IfrSupportLib
-  HiiLib
+  UefiLib
 
 [Protocols]
   gEfiConsoleControlProtocolGuid