diff --git a/MdePkg/Include/Protocol/S3SaveState.h b/MdePkg/Include/Protocol/S3SaveState.h
index c56d083c89..2d5c566420 100644
--- a/MdePkg/Include/Protocol/S3SaveState.h
+++ b/MdePkg/Include/Protocol/S3SaveState.h
@@ -95,7 +95,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_S3_SAVE_STATE_INSERT)(
-   IN       struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,
+   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,
    IN       BOOLEAN                             BeforeOrAfter,
    IN OUT   EFI_S3_BOOT_SCRIPT_POSITION         *Position       OPTIONAL,
    IN       UINT16                              OpCode,
@@ -132,11 +132,11 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_S3_SAVE_STATE_LABEL)(
-   IN     struct _EFI_S3_SAVE_STATE_PROTOCOL    *This,
-   IN     BOOLEAN                               BeforeOrAfter,
-   IN     BOOLEAN                               CreateIfNotFound,
-   IN OUT EFI_S3_BOOT_SCRIPT_POSITION           *Position OPTIONAL,
-   IN     CONST CHAR8                           *Label
+   IN CONST  struct _EFI_S3_SAVE_STATE_PROTOCOL    *This,
+   IN        BOOLEAN                               BeforeOrAfter,
+   IN        BOOLEAN                               CreateIfNotFound,
+   IN OUT    EFI_S3_BOOT_SCRIPT_POSITION           *Position OPTIONAL,
+   IN CONST  CHAR8                           *Label
 );
 
 /**
@@ -157,10 +157,10 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_S3_SAVE_STATE_COMPARE)(
-   IN   struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,
-   IN   EFI_S3_BOOT_SCRIPT_POSITION         Position1,
-   IN   EFI_S3_BOOT_SCRIPT_POSITION         Position2,
-   OUT  UINTN                               *RelativePosition
+   IN CONST struct _EFI_S3_SAVE_STATE_PROTOCOL  *This,
+   IN       EFI_S3_BOOT_SCRIPT_POSITION         Position1,
+   IN       EFI_S3_BOOT_SCRIPT_POSITION         Position2,
+   OUT      UINTN                               *RelativePosition
 );
 
 struct _EFI_S3_SAVE_STATE_PROTOCOL {
diff --git a/MdePkg/Include/Protocol/S3SmmSaveState.h b/MdePkg/Include/Protocol/S3SmmSaveState.h
index f21975554b..83640f30bf 100644
--- a/MdePkg/Include/Protocol/S3SmmSaveState.h
+++ b/MdePkg/Include/Protocol/S3SmmSaveState.h
@@ -37,13 +37,9 @@
 #define EFI_S3_SMM_SAVE_STATE_PROTOCOL_GUID \
     {0x320afe62, 0xe593, 0x49cb, { 0xa9, 0xf1, 0xd4, 0xc2, 0xf4, 0xaf, 0x1, 0x4c }}
     
-typedef struct _EFI_S3_SMM_SAVE_STATE_PROTOCOL {
-  EFI_S3_SAVE_STATE_WRITE   Write;
-  EFI_S3_SAVE_STATE_INSERT  Insert;
-  EFI_S3_SAVE_STATE_LABEL   Label;
-  EFI_S3_SAVE_STATE_COMPARE Compare;
-} EFI_S3_SMM_SAVE_STATE_PROTOCOL;    
-    
+
+typedef EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SMM_SAVE_STATE_PROTOCOL;
+
 extern EFI_GUID gEfiS3SmmSaveStateProtocolGuid;
     
 #endif // __S3_SMM_SAVE_STATE_H__