30 files changed, 30 insertions, 30 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h
index 58c953fea4..9563d0a956 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h
@@ -27,7 +27,7 @@ Abstract:
 
 #define PEI_BLOCK_IO_PPI_GUID \
   { \
-    0x695d8aa1, 0x42ee, 0x4c46, 0x80, 0x5c, 0x6e, 0xa6, 0xbc, 0xe7, 0x99, 0xe3 \
+    0x695d8aa1, 0x42ee, 0x4c46, {0x80, 0x5c, 0x6e, 0xa6, 0xbc, 0xe7, 0x99, 0xe3} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_RECOVERY_BLOCK_IO_INTERFACE);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootInRecoveryMode/BootInRecoveryMode.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootInRecoveryMode/BootInRecoveryMode.h
index d601cb53b1..eb6de5cb07 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootInRecoveryMode/BootInRecoveryMode.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootInRecoveryMode/BootInRecoveryMode.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_BOOT_IN_RECOVERY_MODE_PEIM_PPI \
   { \
-    0x17ee496a, 0xd8e4, 0x4b9a, 0x94, 0xd1, 0xce, 0x82, 0x72, 0x30, 0x8, 0x50 \
+    0x17ee496a, 0xd8e4, 0x4b9a, {0x94, 0xd1, 0xce, 0x82, 0x72, 0x30, 0x8, 0x50} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_BOOT_IN_RECOVERY_MODE_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootMode/BootMode.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootMode/BootMode.h
index e0cf8dec18..f43d08c6f3 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootMode/BootMode.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootMode/BootMode.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_MASTER_BOOT_MODE_PEIM_PPI \
   { \
-    0x7408d748, 0xfc8c, 0x4ee6, 0x92, 0x88, 0xc4, 0xbe, 0xc0, 0x92, 0xa4, 0x10 \
+    0x7408d748, 0xfc8c, 0x4ee6, {0x92, 0x88, 0xc4, 0xbe, 0xc0, 0x92, 0xa4, 0x10} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_MASTER_BOOT_MODE_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h
index 48df299003..7417481217 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_BOOT_SCRIPT_EXECUTER_PPI_GUID \
   { \
-    0xabd42895, 0x78cf, 0x4872, 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff \
+    0xabd42895, 0x78cf, 0x4872, {0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_BOOT_SCRIPT_EXECUTER_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h
index 8a4c5f6e0c..383c16e349 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h
@@ -26,7 +26,7 @@ Abstract:
 
 #define PEI_CPU_IO_PPI_GUID \
   { \
-    0xe6af1f7b, 0xfc3f, 0x46da, 0xa8, 0x28, 0xa3, 0xb4, 0x57, 0xa4, 0x42, 0x82 \
+    0xe6af1f7b, 0xfc3f, 0x46da, {0xa8, 0x28, 0xa3, 0xb4, 0x57, 0xa4, 0x42, 0x82} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_CPU_IO_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h
index 9d5c0538da..fde80ffa95 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h
@@ -24,7 +24,7 @@ Abstract:
 
 
 #define EFI_PEI_DECOMPRESS_PPI_GUID \
-  { 0x1a36e4e7, 0xfab6, 0x476a, 0x8e, 0x75, 0x69, 0x5a, 0x5, 0x76, 0xfd, 0xd7}
+  { 0x1a36e4e7, 0xfab6, 0x476a, {0x8e, 0x75, 0x69, 0x5a, 0x5, 0x76, 0xfd, 0xd7}}
 
 EFI_FORWARD_DECLARATION (EFI_PEI_DECOMPRESS_PPI);
 
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h
index cbaa0da296..0f5a027efb 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h
@@ -25,7 +25,7 @@ Abstract:
 
 #define PEI_DEVICE_RECOVERY_MODULE_INTERFACE_PPI \
   { \
-    0x0DE2CE25, 0x446A, 0x45a7, 0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37 \
+    0x0DE2CE25, 0x446A, 0x45a7, {0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_DEVICE_RECOVERY_MODULE_INTERFACE);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h
index 5287ebe285..f163eff8a2 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h
@@ -29,7 +29,7 @@ Abstract:
 
 #define EFI_DXE_IPL_PPI_GUID \
   { \
-    0xae8ce5d, 0xe448, 0x4437, 0xa8, 0xd7, 0xeb, 0xf5, 0xf1, 0x94, 0xf7, 0x31 \
+    0xae8ce5d, 0xe448, 0x4437, {0xa8, 0xd7, 0xeb, 0xf5, 0xf1, 0x94, 0xf7, 0x31} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_DXE_IPL_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/EndOfPeiSignal/EndOfPeiSignal.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/EndOfPeiSignal/EndOfPeiSignal.h
index 250d052f56..2ea1f756c7 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/EndOfPeiSignal/EndOfPeiSignal.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/EndOfPeiSignal/EndOfPeiSignal.h
@@ -25,7 +25,7 @@ Abstract:
 
 #define PEI_END_OF_PEI_PHASE_PPI_GUID \
   { \
-    0x605EA650, 0xC65C, 0x42e1, 0xBA, 0x80, 0x91, 0xA5, 0x2A, 0xB6, 0x18, 0xC6 \
+    0x605EA650, 0xC65C, 0x42e1, {0xBA, 0x80, 0x91, 0xA5, 0x2A, 0xB6, 0x18, 0xC6} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_END_OF_PEI_SIGNAL_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h
index d8c810e134..750a49abe3 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h
@@ -28,7 +28,7 @@ Abstract:
 
 #define EFI_FIND_FV_PPI_GUID \
   { \
-    0x36164812, 0xa023, 0x44e5, 0xbd, 0x85, 0x5, 0xbf, 0x3c, 0x77, 0x0, 0xaa \
+    0x36164812, 0xa023, 0x44e5, {0xbd, 0x85, 0x5, 0xbf, 0x3c, 0x77, 0x0, 0xaa} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_FIND_FV_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.c b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.c
index 73ff00c80d..58b47878e9 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.c
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.c
@@ -27,4 +27,4 @@ Abstract:
 //
 // There is no PPI Guid definition here, since the guid of
 // this ppi is the same as the firmware volume format Guid.
-//
-\ No newline at end of file
+//
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.c b/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.c
index 5cfb65880d..937142f668 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.c
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.c
@@ -26,4 +26,4 @@ Abstract:
 //
 // There is no PPI Guid definition here since this PPI is for
 // extract EFI_SECTION_GUID_DEFINED type section.
-//
-\ No newline at end of file
+//
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h
index ab02e70022..a3c2f26f6f 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define EFI_PEI_FV_FILE_LOADER_GUID \
   { \
-    0x7e1f0d85, 0x4ff, 0x4bb2, 0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 \
+    0x7e1f0d85, 0x4ff, 0x4bb2, {0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_PEI_FV_FILE_LOADER_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h
index 65a1418da5..6850954abc 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h
@@ -25,7 +25,7 @@ Abstract:
 EFI_FORWARD_DECLARATION (EFI_PEI_LOAD_FILE_PPI);
 
 #define EFI_PEI_LOAD_FILE_GUID \
-  { 0xb9e0abfe, 0x5979, 0x4914, 0x97, 0x7f, 0x6d, 0xee, 0x78, 0xc2, 0x78, 0xa6}
+  { 0xb9e0abfe, 0x5979, 0x4914, {0x97, 0x7f, 0x6d, 0xee, 0x78, 0xc2, 0x78, 0xa6}}
 
 
 typedef
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/MemoryDiscovered/MemoryDiscovered.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/MemoryDiscovered/MemoryDiscovered.h
index 9fc5c3a92a..da74b890a0 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/MemoryDiscovered/MemoryDiscovered.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/MemoryDiscovered/MemoryDiscovered.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_PERMANENT_MEMORY_INSTALLED_PPI_GUID \
   { \
-    0xf894643d, 0xc449, 0x42d1, 0x8e, 0xa8, 0x85, 0xbd, 0xd8, 0xc6, 0x5b, 0xde \
+    0xf894643d, 0xc449, 0x42d1, {0x8e, 0xa8, 0x85, 0xbd, 0xd8, 0xc6, 0x5b, 0xde} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_PERMANENT_MEMORY_INSTALLED_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h
index 00ab983aa5..6385842e1b 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h
@@ -27,7 +27,7 @@ Abstract:
 
 #define PEI_PCI_CFG_PPI_GUID \
   { \
-    0xe1f2eba0, 0xf7b9, 0x4a26, 0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90 \
+    0xe1f2eba0, 0xf7b9, 0x4a26, {0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_PCI_CFG_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h
index ece3a8ff5a..926f9cf3c5 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h
@@ -27,7 +27,7 @@ Abstract:
 
 #define EFI_PEI_PCI_CFG2_PPI_GUID \
   { \
-    0x57a449a, 0x1fdc, 0x4c06, 0xbf, 0xc9, 0xf5, 0x3f, 0x6a, 0x99, 0xbb, 0x92 \
+    0x57a449a, 0x1fdc, 0x4c06, {0xbf, 0xc9, 0xf5, 0x3f, 0x6a, 0x99, 0xbb, 0x92} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_PEI_PCI_CFG2_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h
index e0ceecab16..d98ef1fa8b 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_RECOVERY_MODULE_INTERFACE_PPI \
   { \
-    0xFB6D9542, 0x612D, 0x4f45, 0x87, 0x2F, 0x5C, 0xFF, 0x52, 0xE9, 0x3D, 0xCF \
+    0xFB6D9542, 0x612D, 0x4f45, {0x87, 0x2F, 0x5C, 0xFF, 0x52, 0xE9, 0x3D, 0xCF} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_RECOVERY_MODULE_INTERFACE);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
index d3269b488f..88f7b83de6 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
@@ -26,7 +26,7 @@ Abstract:
 
 #define PEI_RESET_PPI_GUID \
   { \
-    0xef398d58, 0x9dfd, 0x4103, 0xbf, 0x94, 0x78, 0xc6, 0xf4, 0xfe, 0x71, 0x2f \
+    0xef398d58, 0x9dfd, 0x4103, {0xbf, 0x94, 0x78, 0xc6, 0xf4, 0xfe, 0x71, 0x2f} \
   }
 
 //
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h
index f98cbc31a7..54d9873337 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_S3_RESUME_PPI_GUID \
   { \
-    0x4426CCB2, 0xE684, 0x4a8a, 0xAE, 0x40, 0x20, 0xD4, 0xB0, 0x25, 0xB7, 0x10 \
+    0x4426CCB2, 0xE684, 0x4a8a, {0xAE, 0x40, 0x20, 0xD4, 0xB0, 0x25, 0xB7, 0x10} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_S3_RESUME_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h
index 82bbb6f829..3c85b703bf 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define EFI_SEC_PLATFORM_INFORMATION_GUID \
   { \
-    0x6f8c2b35, 0xfef4, 0x448d, 0x82, 0x56, 0xe1, 0x1b, 0x19, 0xd6, 0x10, 0x77 \
+    0x6f8c2b35, 0xfef4, 0x448d, {0x82, 0x56, 0xe1, 0x1b, 0x19, 0xd6, 0x10, 0x77} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_SEC_PLATFORM_INFORMATION_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h
index fec98b102f..b487fe9749 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define EFI_PEI_SECTION_EXTRACTION_PPI_GUID \
   { \
-    0x4F89E208, 0xE144, 0x4804, 0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 \
+    0x4F89E208, 0xE144, 0x4804, {0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_PEI_SECTION_EXTRACTION_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h
index 737fabe104..7867493173 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_SECURITY_PPI_GUID \
   { \
-    0x1388066e, 0x3a57, 0x4efa, 0x98, 0xf3, 0xc1, 0x2f, 0x3a, 0x95, 0x8a, 0x29 \
+    0x1388066e, 0x3a57, 0x4efa, {0x98, 0xf3, 0xc1, 0x2f, 0x3a, 0x95, 0x8a, 0x29} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_SECURITY_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h
index 0b62194e3e..05afafd14b 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h
@@ -24,7 +24,7 @@ Abstract:
 #define __SECURITY2_PPI_H__
 
 #define EFI_PEI_SECURITY2_PPI_GUID \
-  { 0xdcd0be23, 0x9586, 0x40f4, 0xb6, 0x43, 0x6, 0x52, 0x2c, 0xed, 0x4e, 0xde}
+  { 0xdcd0be23, 0x9586, 0x40f4, {0xb6, 0x43, 0x6, 0x52, 0x2c, 0xed, 0x4e, 0xde}}
 
 
 EFI_FORWARD_DECLARATION (EFI_PEI_SECURITY2_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h
index 5864dcf74e..288888cb32 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h
@@ -27,7 +27,7 @@ Abstract:
 
 #define PEI_SMBUS_PPI_GUID \
   { \
-    0xabd42895, 0x78cf, 0x4872, 0x84, 0x44, 0x1b, 0x5c, 0x18, 0xb, 0xfb, 0xda \
+    0xabd42895, 0x78cf, 0x4872, {0x84, 0x44, 0x1b, 0x5c, 0x18, 0xb, 0xfb, 0xda} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_SMBUS_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h
index 4a9794518c..74e7bcd5a4 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h
@@ -27,7 +27,7 @@ Abstract:
 
 #define PEI_SMBUS2_PPI_GUID \
   { \
-    0x9ca93627, 0xb65b, 0x4324, 0xa2, 0x2, 0xc0, 0xb4, 0x61, 0x76, 0x45, 0x43 \
+    0x9ca93627, 0xb65b, 0x4324, {0xa2, 0x2, 0xc0, 0xb4, 0x61, 0x76, 0x45, 0x43} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_PEI_SMBUS2_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h
index 311d351bc8..aa7cc7b72a 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_STALL_PPI_GUID \
   { \
-    0x1f4c6f90, 0xb06b, 0x48d8, 0xa2, 0x01, 0xba, 0xe5, 0xf1, 0xcd, 0x7d, 0x56 \
+    0x1f4c6f90, 0xb06b, 0x48d8, {0xa2, 0x01, 0xba, 0xe5, 0xf1, 0xcd, 0x7d, 0x56} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_STALL_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h
index 41be87f890..2f4e5ea4fa 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h
@@ -24,7 +24,7 @@ Abstract:
 
 #define PEI_STATUS_CODE_PPI_GUID \
   { \
-    0x229832d3, 0x7a30, 0x4b36, 0xb8, 0x27, 0xf4, 0xc, 0xb7, 0xd4, 0x54, 0x36 \
+    0x229832d3, 0x7a30, 0x4b36, {0xb8, 0x27, 0xf4, 0xc, 0xb7, 0xd4, 0x54, 0x36} \
   }
 
 EFI_FORWARD_DECLARATION (PEI_STATUS_CODE_PPI);
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable/Variable.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable/Variable.h
index f07fe360db..8257b68bf6 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable/Variable.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable/Variable.h
@@ -26,7 +26,7 @@ Abstract:
 
 #define PEI_READ_ONLY_VARIABLE_ACCESS_PPI_GUID \
   { \
-    0x3cdc90c6, 0x13fb, 0x4a75, 0x9e, 0x79, 0x59, 0xe9, 0xdd, 0x78, 0xb9, 0xfa \
+    0x3cdc90c6, 0x13fb, 0x4a75, {0x9e, 0x79, 0x59, 0xe9, 0xdd, 0x78, 0xb9, 0xfa} \
   }
 
 
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h
index 8e2614a44e..b7bea84c27 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h
@@ -26,7 +26,7 @@ Abstract:
 
 #define EFI_PEI_READ_ONLY_VARIABLE2_PPI_GUID \
   { \
-    0x2ab86ef5, 0xecb5, 0x4134, 0xb5, 0x56, 0x38, 0x54, 0xca, 0x1f, 0xe1, 0xb4 \
+    0x2ab86ef5, 0xecb5, 0x4134, {0xb5, 0x56, 0x38, 0x54, 0xca, 0x1f, 0xe1, 0xb4} \
   }
 
 EFI_FORWARD_DECLARATION (EFI_PEI_READ_ONLY_VARIABLE2_PPI);