diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/Library/PrePiLib.h
index 54f8e1e582..399a8d59a9 100644
--- a/EmbeddedPkg/Include/Library/PrePiLib.h
+++ b/EmbeddedPkg/Include/Library/PrePiLib.h
@@ -745,7 +745,7 @@ LoadDxeCoreFromFfsFile (
 EFI_STATUS
 EFIAPI
 LoadDxeCoreFromFv (
-  IN UINTN  *FvInstance,   OPTIONAL
+  IN UINTN  *FvInstance    OPTIONAL,
   IN UINTN  StackSize
   );
 
diff --git a/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c b/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c
index 26deee3fdc..12885f4230 100644
--- a/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c
+++ b/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c
@@ -167,7 +167,7 @@ EFIAPI
 ExtractGuidedSectionDecode (
   IN  CONST VOID    *InputSection,
   OUT       VOID    **OutputBuffer,
-  OUT       VOID    *ScratchBuffer,        OPTIONAL
+  OUT       VOID    *ScratchBuffer         OPTIONAL,
   OUT       UINT32  *AuthenticationStatus
   )
 {
diff --git a/EmbeddedPkg/Library/PrePiHobLib/Hob.c b/EmbeddedPkg/Library/PrePiHobLib/Hob.c
index b5cc6c5d8f..69d899e3c7 100644
--- a/EmbeddedPkg/Library/PrePiHobLib/Hob.c
+++ b/EmbeddedPkg/Library/PrePiHobLib/Hob.c
@@ -582,7 +582,7 @@ BuildFv3Hob (
   IN          UINT64                      Length,
   IN          UINT32                      AuthenticationStatus,
   IN          BOOLEAN                     ExtractedFv,
-  IN CONST    EFI_GUID                    *FvName, OPTIONAL
+  IN CONST    EFI_GUID                    *FvName  OPTIONAL,
   IN CONST    EFI_GUID                    *FileName OPTIONAL
   )
 {
@@ -846,4 +846,3 @@ BuildMemoryTypeInformationHob (
 
   BuildGuidDataHob (&gEfiMemoryTypeInformationGuid, &Info, sizeof (Info));
 }
-
diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c b/EmbeddedPkg/Library/PrePiLib/FwVol.c
index 83aa40f794..7b9853bab7 100644
--- a/EmbeddedPkg/Library/PrePiLib/FwVol.c
+++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c
@@ -156,7 +156,7 @@ FileHandleToVolume (
 EFI_STATUS
 FindFileEx (
   IN  CONST EFI_PEI_FV_HANDLE        FvHandle,
-  IN  CONST EFI_GUID                 *FileName,   OPTIONAL
+  IN  CONST EFI_GUID                 *FileName    OPTIONAL,
   IN        EFI_FV_FILETYPE          SearchType,
   IN OUT    EFI_PEI_FILE_HANDLE      *FileHandle
   )
diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
index d20617cf4b..b9344ed865 100644
--- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
+++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
@@ -202,7 +202,7 @@ LoadDxeCoreFromFfsFile (
 EFI_STATUS
 EFIAPI
 LoadDxeCoreFromFv (
-  IN UINTN  *FvInstance,   OPTIONAL
+  IN UINTN  *FvInstance    OPTIONAL,
   IN UINTN  StackSize
   )
 {