8 files changed, 13 insertions, 17 deletions
diff --git a/EmbeddedPkg/Include/Guid/ConsolePrefFormSet.h b/EmbeddedPkg/Include/Guid/ConsolePrefFormSet.h
index daa208f8a6..2f1174c2b0 100644
--- a/EmbeddedPkg/Include/Guid/ConsolePrefFormSet.h
+++ b/EmbeddedPkg/Include/Guid/ConsolePrefFormSet.h
@@ -12,6 +12,6 @@
 #define CONSOLE_PREF_FORMSET_GUID  \
   { 0x2d2358b4, 0xe96c, 0x484d, { 0xb2, 0xdd, 0x7c, 0x2e, 0xdf, 0xc7, 0xd5, 0x6f } }
 
-extern EFI_GUID gConsolePrefFormSetGuid;
+extern EFI_GUID  gConsolePrefFormSetGuid;
 
 #endif
diff --git a/EmbeddedPkg/Include/Guid/DtPlatformDefaultDtbFile.h b/EmbeddedPkg/Include/Guid/DtPlatformDefaultDtbFile.h
index cd21900a20..d95863066e 100644
--- a/EmbeddedPkg/Include/Guid/DtPlatformDefaultDtbFile.h
+++ b/EmbeddedPkg/Include/Guid/DtPlatformDefaultDtbFile.h
@@ -12,6 +12,6 @@
 #define DT_PLATFORM_DEFAULT_DTB_FILE_GUID  \
   { 0x25462cda, 0x221f, 0x47df, { 0xac, 0x1d, 0x25, 0x9c, 0xfa, 0xa4, 0xe3, 0x26 } }
 
-extern EFI_GUID gDtPlatformDefaultDtbFileGuid;
+extern EFI_GUID  gDtPlatformDefaultDtbFileGuid;
 
 #endif
diff --git a/EmbeddedPkg/Include/Guid/DtPlatformFormSet.h b/EmbeddedPkg/Include/Guid/DtPlatformFormSet.h
index 1bafe8441a..5d751bbd96 100644
--- a/EmbeddedPkg/Include/Guid/DtPlatformFormSet.h
+++ b/EmbeddedPkg/Include/Guid/DtPlatformFormSet.h
@@ -12,6 +12,6 @@
 #define DT_PLATFORM_FORMSET_GUID  \
   { 0x2b7a240d, 0xd5ad, 0x4fd6, { 0xbe, 0x1c, 0xdf, 0xa4, 0x41, 0x5f, 0x55, 0x26 } }
 
-extern EFI_GUID gDtPlatformFormSetGuid;
+extern EFI_GUID  gDtPlatformFormSetGuid;
 
 #endif
diff --git a/EmbeddedPkg/Include/Guid/ExtractSection.h b/EmbeddedPkg/Include/Guid/ExtractSection.h
index f1781197e4..7346296fbc 100644
--- a/EmbeddedPkg/Include/Guid/ExtractSection.h
+++ b/EmbeddedPkg/Include/Guid/ExtractSection.h
@@ -11,20 +11,18 @@
 
 #include <Library/ExtractGuidedSectionLib.h>
 
-
 //
 // The GUID for this protocol mathes the Decompression scheme being used
 // So for example LZMA would be gLzmaCustomDecompressGuid
 //
 typedef struct {
-  EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER   SectionGetInfo;
-  EXTRACT_GUIDED_SECTION_DECODE_HANDLER     SectionExtraction;
+  EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER    SectionGetInfo;
+  EXTRACT_GUIDED_SECTION_DECODE_HANDLER      SectionExtraction;
 } EXTRACT_SECTION_DATA;
 
 typedef struct {
-  EFI_HOB_GUID_TYPE     Hob;
-  EXTRACT_SECTION_DATA  Data;
+  EFI_HOB_GUID_TYPE       Hob;
+  EXTRACT_SECTION_DATA    Data;
 } EXTRACT_SECTION_HOB;
 
 #endif
-
diff --git a/EmbeddedPkg/Include/Guid/Fdt.h b/EmbeddedPkg/Include/Guid/Fdt.h
index 3c719189ae..e009146829 100644
--- a/EmbeddedPkg/Include/Guid/Fdt.h
+++ b/EmbeddedPkg/Include/Guid/Fdt.h
@@ -12,11 +12,11 @@
 #define FDT_TABLE_GUID \
   { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } }
 
-extern EFI_GUID gFdtTableGuid;
+extern EFI_GUID  gFdtTableGuid;
 
 #define FDT_VARIABLE_GUID \
   { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } }
 
-extern EFI_GUID gFdtVariableGuid;
+extern EFI_GUID  gFdtVariableGuid;
 
 #endif /* __FDT_H__ */
diff --git a/EmbeddedPkg/Include/Guid/FdtHob.h b/EmbeddedPkg/Include/Guid/FdtHob.h
index f8719dbb94..2425a13ffe 100644
--- a/EmbeddedPkg/Include/Guid/FdtHob.h
+++ b/EmbeddedPkg/Include/Guid/FdtHob.h
@@ -10,11 +10,11 @@
 #ifndef __FDT_HOB_H__
 #define __FDT_HOB_H__
 
-#define FDT_HOB_GUID { \
+#define FDT_HOB_GUID  {\
           0x16958446, 0x19B7, 0x480B, \
           { 0xB0, 0x47, 0x74, 0x85, 0xAD, 0x3F, 0x71, 0x6D } \
         }
 
-extern EFI_GUID gFdtHobGuid;
+extern EFI_GUID  gFdtHobGuid;
 
 #endif
diff --git a/EmbeddedPkg/Include/Guid/NvVarStoreFormatted.h b/EmbeddedPkg/Include/Guid/NvVarStoreFormatted.h
index 7728f9277f..96e1e91caf 100644
--- a/EmbeddedPkg/Include/Guid/NvVarStoreFormatted.h
+++ b/EmbeddedPkg/Include/Guid/NvVarStoreFormatted.h
@@ -18,7 +18,6 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-
 #ifndef __EDKII_NV_VAR_STORE_FORMATTED_H__
 #define __EDKII_NV_VAR_STORE_FORMATTED_H__
 
@@ -28,6 +27,6 @@
     { 0x83, 0xcd, 0xdc, 0x2c, 0x29, 0xc8, 0x91, 0xa3 } \
   }
 
-extern EFI_GUID gEdkiiNvVarStoreFormattedGuid;
+extern EFI_GUID  gEdkiiNvVarStoreFormattedGuid;
 
 #endif
diff --git a/EmbeddedPkg/Include/Guid/PlatformHasDeviceTree.h b/EmbeddedPkg/Include/Guid/PlatformHasDeviceTree.h
index 102a6b8cc3..d05f109039 100644
--- a/EmbeddedPkg/Include/Guid/PlatformHasDeviceTree.h
+++ b/EmbeddedPkg/Include/Guid/PlatformHasDeviceTree.h
@@ -14,7 +14,6 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-
 #ifndef __EDKII_PLATFORM_HAS_DEVICE_TREE_H__
 #define __EDKII_PLATFORM_HAS_DEVICE_TREE_H__
 
@@ -24,6 +23,6 @@
     { 0xb2, 0xaf, 0x54, 0x1e, 0x1d, 0xce, 0x14, 0x8b } \
   }
 
-extern EFI_GUID gEdkiiPlatformHasDeviceTreeGuid;
+extern EFI_GUID  gEdkiiPlatformHasDeviceTreeGuid;
 
 #endif