8 files changed, 13 insertions, 13 deletions
diff --git a/MdePkg/Include/Library/PeiCoreEntryPoint.h b/MdePkg/Include/Library/PeiCoreEntryPoint.h
index 00105f5d0b..1d29b118d1 100644
--- a/MdePkg/Include/Library/PeiCoreEntryPoint.h
+++ b/MdePkg/Include/Library/PeiCoreEntryPoint.h
@@ -71,7 +71,7 @@ EfiMain (
 VOID
 EFIAPI
 ProcessLibraryConstructorList (
-  IN EFI_FFS_FILE_HEADER  *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,
   IN EFI_PEI_SERVICES     **PeiServices
   );
 
diff --git a/MdePkg/Include/Library/PeimEntryPoint.h b/MdePkg/Include/Library/PeimEntryPoint.h
index e08845926d..37d3476361 100644
--- a/MdePkg/Include/Library/PeimEntryPoint.h
+++ b/MdePkg/Include/Library/PeimEntryPoint.h
@@ -32,7 +32,7 @@ extern const UINT32                   _gPeimRevision;
 EFI_STATUS
 EFIAPI
 _ModuleEntryPoint (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,
   IN EFI_PEI_SERVICES          **PeiServices
   );
 
@@ -49,7 +49,7 @@ _ModuleEntryPoint (
 EFI_STATUS
 EFIAPI
 EfiMain (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,
   IN EFI_PEI_SERVICES          **PeiServices
   );
 
@@ -64,7 +64,7 @@ EfiMain (
 VOID
 EFIAPI
 ProcessLibraryConstructorList (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,
   IN EFI_PEI_SERVICES          **PeiServices
   );
 
@@ -79,7 +79,7 @@ ProcessLibraryConstructorList (
 VOID
 EFIAPI
 ProcessLibraryDestructorList (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,
   IN EFI_PEI_SERVICES          **PeiServices
   );
 
@@ -96,7 +96,7 @@ ProcessLibraryDestructorList (
 EFI_STATUS
 EFIAPI
 ProcessModuleEntryPointList (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,
   IN EFI_PEI_SERVICES          **PeiServices
   );
 
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index 860c5272f4..49c233ce73 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -54,7 +54,7 @@ GetPeiServicesTablePointer (
 EFI_STATUS
 EFIAPI
 PeiServicesTablePointerLibConstructor (
-  IN EFI_FFS_FILE_HEADER  *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,
   IN EFI_PEI_SERVICES     **PeiServices
   )
 {
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h
index 0e0e4ffe01..8c66994a8b 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerInternal.h
@@ -29,7 +29,7 @@
 EFI_STATUS
 EFIAPI
 PeiServicesTablePointerLibConstructor (
-  IN EFI_FFS_FILE_HEADER  *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,
   IN EFI_PEI_SERVICES     **PeiServices
   )
 ;
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
index a37cc2d84b..40321380d3 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -34,7 +34,7 @@
 
 [Sources.common]
   PeiServicesTablePointer.c
-
+  PeiServicesTablePointerInternal.h
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
index 94895b30c9..95d6d25447 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointer.c
@@ -54,7 +54,7 @@ GetPeiServicesTablePointer (
 EFI_STATUS
 EFIAPI
 PeiServicesTablePointerLibConstructor (
-  IN EFI_FFS_FILE_HEADER  *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,
   IN EFI_PEI_SERVICES     **PeiServices
   )
 {
diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
index e484337df8..d26a0be939 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
@@ -59,7 +59,7 @@ GetPeiServicesTablePointer (
 EFI_STATUS
 EFIAPI
 PeiServicesTablePointerLibConstructor (
-  IN EFI_FFS_FILE_HEADER  *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,
   IN EFI_PEI_SERVICES     **PeiServices
   )
 {
diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
index 0b9bca3b87..e3f47d2673 100644
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS
 EFIAPI
 _ModuleEntryPoint (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE       *FfsHeader,
   IN EFI_PEI_SERVICES          **PeiServices
   )
 {
@@ -67,7 +67,7 @@ _ModuleEntryPoint (
 EFI_STATUS
 EFIAPI
 EfiMain (
-  IN EFI_FFS_FILE_HEADER  *FfsHeader,
+  IN EFI_PEI_FILE_HANDLE  *FfsHeader,
   IN EFI_PEI_SERVICES     **PeiServices
   )
 {