diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
index 4a19f37e59..c29e4f2aa4 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
@@ -1094,7 +1094,7 @@ RETURN_STATUS
 ReceivePacket (
   OUT UINT8             *InputPacket,
   OUT BOOLEAN           *BreakReceived,
-  OUT BOOLEAN           *IncompatibilityFlag, OPTIONAL
+  OUT BOOLEAN           *IncompatibilityFlag  OPTIONAL,
   IN  UINTN             Timeout,
   IN  BOOLEAN           SkipStartSymbol
   )
@@ -1208,7 +1208,7 @@ RETURN_STATUS
 SendCommandAndWaitForAckOK (
   IN  UINT8               Command,
   IN  UINTN               Timeout,
-  OUT BOOLEAN             *BreakReceived, OPTIONAL
+  OUT BOOLEAN             *BreakReceived  OPTIONAL,
   OUT BOOLEAN             *IncompatibilityFlag OPTIONAL
   )
 {
@@ -1441,7 +1441,7 @@ CompressData (
   IN  UINT8             *Data,
   IN  UINT8             Length,
   IN  BOOLEAN           Send,
-  OUT UINTN             *CompressedLength,  OPTIONAL
+  OUT UINTN             *CompressedLength   OPTIONAL,
   OUT UINT16            *CompressedCrc      OPTIONAL
   )
 {
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
index 70564ffd53..84258aa0f9 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
@@ -348,7 +348,7 @@ VOID
 EFIAPI
 InitializeDebugAgent (
   IN UINT32                InitFlag,
-  IN VOID                  *Context, OPTIONAL
+  IN VOID                  *Context  OPTIONAL,
   IN DEBUG_AGENT_CONTINUE  Function  OPTIONAL
   )
 {
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
index 0f639ecbcd..ea3ae33f3f 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
@@ -353,7 +353,7 @@ VOID
 EFIAPI
 InitializeDebugAgent (
   IN UINT32                InitFlag,
-  IN VOID                  *Context, OPTIONAL
+  IN VOID                  *Context  OPTIONAL,
   IN DEBUG_AGENT_CONTINUE  Function  OPTIONAL
   )
 {
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
index 3bdfaa9370..5f0fe05bad 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
@@ -175,7 +175,7 @@ VOID
 EFIAPI
 InitializeDebugAgent (
   IN UINT32                InitFlag,
-  IN VOID                  *Context, OPTIONAL
+  IN VOID                  *Context  OPTIONAL,
   IN DEBUG_AGENT_CONTINUE  Function  OPTIONAL
   )
 {