3 files changed, 2 insertions, 9 deletions
diff --git a/EdkModulePkg/Include/Protocol/UgaIo.h b/EdkModulePkg/Include/Protocol/UgaIo.h
index 91ff8df..561dafd 100644
--- a/EdkModulePkg/Include/Protocol/UgaIo.h
+++ b/EdkModulePkg/Include/Protocol/UgaIo.h
@@ -63,7 +63,6 @@ typedef struct _UGA_DEVICE {
 }
 UGA_DEVICE, *PUGA_DEVICE;
 
-#ifndef UGA_IO_REQUEST_CODE
 //
 // Prevent conflicts with UGA typedefs.
 //
@@ -94,8 +93,6 @@ typedef enum {
 }
 UGA_IO_REQUEST_CODE, *PUGA_IO_REQUEST_CODE;
 
-#endif
-
 typedef struct {
   IN UGA_IO_REQUEST_CODE  ioRequestCode;
   IN VOID                 *pvInBuffer;
diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h
index 6c3489f..a5c9f0d 100644
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h
@@ -85,16 +85,14 @@ Revision History
 // Check to see if current build support option active feature of
 // some driver option
 //
-#ifndef LOAD_OPTION_ACTIVE
 #define LOAD_OPTION_ACTIVE  0x00000001
-#endif
+
 //
 // Check to see if current build support force reconnect feature of
 // some driver option
 //
-#ifndef LOAD_OPTION_FORCE_RECONNECT
 #define LOAD_OPTION_FORCE_RECONNECT 0x00000002
-#endif
+
 //
 // Below are the form ids for display, form id is used as callback key value,
 // some key value definitions are also defined here. By defining this enum type,
diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h
index 6b6d887..a7c32ec 100644
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h
@@ -24,9 +24,7 @@ Revision History
 #ifndef _LANGUAGE_H
 #define _LANGUAGE_H
 
-#ifndef ISO_639_2_ENTRY_SIZE
 #define ISO_639_2_ENTRY_SIZE  3
-#endif
 
 VOID
 InitializeLanguage (