diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index ce4501c1db..f4d426cf53 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -654,7 +654,7 @@ PeiFvFindNextVolume (
       // If Not Found, Install FvInfo Ppi for it.
       //
       if (!Match) {
-        PiLibInstallFvInfoPpi (
+        PeiServicesInstallFvInfoPpi (
           NULL,
           (VOID *)(UINTN)FvHob->BaseAddress,
           (UINT32)FvHob->Length,
@@ -913,7 +913,7 @@ ProcessFvFile (
   //
   // Install FvPpi and Build FvHob
   //
-  PiLibInstallFvInfoPpi (
+  PeiServicesInstallFvInfoPpi (
     NULL,
     FvImageInfo.FvStart,
     (UINT32) FvImageInfo.FvSize,
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index c3102950c5..8e0cedd9b4 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -43,7 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/PeImage.h>
 #include <Library/PeiServicesTablePointerLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/PeiPiLib.h>
 #include <Guid/FirmwareFileSystem2.h>
 #include <Guid/AprioriFileName.h>
 
diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index cc2b1c097f..24486fe83f 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -67,7 +67,6 @@
   MemoryAllocationLib
   CacheMaintenanceLib
   PeCoffLib
-  PeiPiLib
   PeiServicesTablePointerLib