diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AuthenticationInfo/AuthenticationInfo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AuthenticationInfo/AuthenticationInfo.h
index b85f4a44fb..f5fc96d185 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AuthenticationInfo/AuthenticationInfo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AuthenticationInfo/AuthenticationInfo.h
@@ -96,10 +96,10 @@ EFI_STATUS
 //
 // Interface structure for the Authentication Info Protocol
 //
-typedef struct _EFI_AUTHENTICATION_INFO_PROTOCOL {
+struct _EFI_AUTHENTICATION_INFO_PROTOCOL {
   EFI_AUTHENTICATION_INFO_PROTOCOL_GET   Get;
   EFI_AUTHENTICATION_INFO_PROTOCOL_SET   Set;
-} EFI_AUTHENTICATION_INFO_PROTOCOL;
+};
 
 extern EFI_GUID gEfiAuthenticationInfoProtocolGuid;
 
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration2/DriverConfiguration2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration2/DriverConfiguration2.h
index 62156bb8d0..23e9c8a9ab 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration2/DriverConfiguration2.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration2/DriverConfiguration2.h
@@ -170,12 +170,12 @@ EFI_STATUS
 //
 // Interface structure for the Driver Configuration Protocol
 //
-typedef struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
+struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
   EFI_DRIVER_CONFIGURATION2_SET_OPTIONS    SetOptions;
   EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID  OptionsValid;
   EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS ForceDefaults;
   CHAR8                                   *SupportedLanguages;
-} EFI_DRIVER_CONFIGURATION2_PROTOCOL;
+};
 
 /*++
 
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics2/DriverDiagnostics2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics2/DriverDiagnostics2.h
index 83bc86453e..2d555bed00 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics2/DriverDiagnostics2.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics2/DriverDiagnostics2.h
@@ -112,10 +112,10 @@ EFI_STATUS
 //
 // Interface structure for the Driver Diagnostics Protocol
 //
-typedef struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL {
+struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL {
   EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS  RunDiagnostics;
   CHAR8                                    *SupportedLanguages;
-} EFI_DRIVER_DIAGNOSTICS2_PROTOCOL;
+};
 
 /*++
 
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverSupportedEfiVersion/DriverSupportedEfiVersion.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverSupportedEfiVersion/DriverSupportedEfiVersion.h
index c0702918d7..29acca8260 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverSupportedEfiVersion/DriverSupportedEfiVersion.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverSupportedEfiVersion/DriverSupportedEfiVersion.h
@@ -37,10 +37,10 @@ EFI_FORWARD_DECLARATION (EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL);
 //
 // Interface structure for the Driver Supported EFI Version Protocol
 //
-typedef struct _EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL {
+struct _EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL {
   UINT32    Length;
   UINT32    FirmwareVersion;
-} EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL;
+};
 
 extern EFI_GUID gEfiDriverSupportedEfiVersionProtocolGuid;
 
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformToDriverConfiguration/PlatformToDriverConfiguration.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformToDriverConfiguration/PlatformToDriverConfiguration.h
index 89b936c113..dee2c1cbde 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformToDriverConfiguration/PlatformToDriverConfiguration.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformToDriverConfiguration/PlatformToDriverConfiguration.h
@@ -162,10 +162,10 @@ EFI_STATUS
 //
 // Interface structure for the Platform to Driver Configuration Protocol
 //
-typedef struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL {
+struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL {
   EFI_PLATFORM_TO_DRIVER_CONFIGURATION_QUERY      Query;
   EFI_PLATFORM_TO_DRIVER_CONFIGURATION_RESPONSE   Response;
-} EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL;
+};
 
 extern EFI_GUID gEfiPlatformToDriverConfigurationProtocolGuid;
 extern EFI_GUID gEfiPlatformToDriverConfigurationClpGuid;
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation2/UnicodeCollation2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation2/UnicodeCollation2.h
index d250da5734..3347f9a176 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation2/UnicodeCollation2.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation2/UnicodeCollation2.h
@@ -188,7 +188,7 @@ BOOLEAN
 --*/
 ;
 
-typedef struct _EFI_UNICODE_COLLATION2_PROTOCOL {
+struct _EFI_UNICODE_COLLATION2_PROTOCOL {
   //
   // general
   //
@@ -204,7 +204,7 @@ typedef struct _EFI_UNICODE_COLLATION2_PROTOCOL {
   EFI_UNICODE_COLLATION2_STRTOFAT    StrToFat;
 
   CHAR8                             *SupportedLanguages;
-} EFI_UNICODE_COLLATION2_PROTOCOL;
+};
 
 extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid;