1. Clean up MdePkg internal header files

The header files in MdePkg/Include/Ia32, X64, Ipf, Ebc, Pi, Uefi directories are the internal header files, which should not be directly included by the modules.

This patch cleans these internal header files to remove the uncessary ProcessorBind.h file.

2. Clean up MdePkg public header files to remove the uncessary internal header files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8324 6f19259b-4bc3-4df7-8a09-765794883524

20 files changed, 130 insertions, 141 deletions

diff --git a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
index edcf6784d4..77cc228147 100644
--- a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
+++ b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
@@ -16,7 +16,7 @@
 #ifndef _ISCSI_BOOT_FIRMWARE_TABLE_H_

 #define _ISCSI_BOOT_FIRMWARE_TABLE_H_

 

-#include "Acpi30.h"

+#include <IndustryStandard/Acpi30.h>

 

 #define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION            0x01

 #define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_STRUCTURE_ALIGNMENT 8

diff --git a/MdePkg/Include/Library/ReportStatusCodeLib.h b/MdePkg/Include/Library/ReportStatusCodeLib.h
index 9375308c4f..49c7c501f1 100644
--- a/MdePkg/Include/Library/ReportStatusCodeLib.h
+++ b/MdePkg/Include/Library/ReportStatusCodeLib.h
@@ -1,7 +1,7 @@
 /** @file

   Provides services to log status code records.

 

-Copyright (c) 2006 - 2008, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __REPORT_STATUS_CODE_LIB_H__

 

 #include <Uefi/UefiBaseType.h>

-#include <Pi/PiMultiPhase.h>

+#include <Pi/PiStatusCode.h>

 #include <Protocol/DevicePath.h>

 

 //

diff --git a/MdePkg/Include/Pi/PiBootMode.h b/MdePkg/Include/Pi/PiBootMode.h
index e3c45a2d00..d15733142d 100644
--- a/MdePkg/Include/Pi/PiBootMode.h
+++ b/MdePkg/Include/Pi/PiBootMode.h
@@ -1,7 +1,7 @@
 /** @file

   Present the boot mode values in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,8 +18,6 @@
 #ifndef __PI_BOOT_MODE_H__

 #define __PI_BOOT_MODE_H__

 

-#include <ProcessorBind.h>

-

 ///

 /// EFI boot mode

 /// 

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 72f0f4088a..9ed4da661a 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -1,7 +1,7 @@
 /** @file

   Include file matches things in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,6 +18,7 @@
 #ifndef __PI_DXECIS_H__

 #define __PI_DXECIS_H__

 

+#include <Uefi/UefiMultiPhase.h>

 #include <Pi/PiMultiPhase.h>

 

 ///

diff --git a/MdePkg/Include/Pi/PiFirmwareFile.h b/MdePkg/Include/Pi/PiFirmwareFile.h
index 8d5dd336f9..b39648b545 100644
--- a/MdePkg/Include/Pi/PiFirmwareFile.h
+++ b/MdePkg/Include/Pi/PiFirmwareFile.h
@@ -1,7 +1,7 @@
 /** @file

   The firmware file related definitions in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -19,8 +19,6 @@
 #ifndef __PI_FIRMWARE_FILE_H__

 #define __PI_FIRMWARE_FILE_H__

 

-#include <ProcessorBind.h>

-

 #pragma pack(1)

 ///

 /// Used to verify the integrity of the file.

diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index d6d69f40e7..f5c1026ea2 100644
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -1,7 +1,7 @@
 /** @file

   The firmware volume related definitions in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,8 +18,6 @@
 #ifndef __PI_FIRMWAREVOLUME_H__

 #define __PI_FIRMWAREVOLUME_H__

 

-#include <ProcessorBind.h>

-

 ///

 /// EFI_FV_FILE_ATTRIBUTES

 ///

diff --git a/MdePkg/Include/Pi/PiHob.h b/MdePkg/Include/Pi/PiHob.h
index 7f4bf8a927..0c51f8e01c 100644
--- a/MdePkg/Include/Pi/PiHob.h
+++ b/MdePkg/Include/Pi/PiHob.h
@@ -1,7 +1,7 @@
 /** @file

   HOB related definitions in PI.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,11 +18,6 @@
 #ifndef __PI_HOB_H__

 #define __PI_HOB_H__

 

-#include <ProcessorBind.h>

-#include <Pi/PiBootMode.h>

-#include <Uefi/UefiBaseType.h>

-#include <Uefi/UefiMultiPhase.h>

-

 //

 // HobType of EFI_HOB_GENERIC_HEADER.

 // 

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index e31d986e96..5791a92281 100644
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file

   Include file matches things in PI for multiple module types.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,103 +18,13 @@
 #ifndef __PI_MULTIPHASE_H__

 #define __PI_MULTIPHASE_H__

 

-#include <Uefi/UefiMultiPhase.h>

-

 #include <Pi/PiFirmwareVolume.h>

 #include <Pi/PiFirmwareFile.h>

 #include <Pi/PiBootMode.h>

-

 #include <Pi/PiHob.h>

 #include <Pi/PiDependency.h>

-

+#include <Pi/PiStatusCode.h>

 

 #define EFI_NOT_AVAILABLE_YET   EFIERR (32)

 

-///

-/// Status Code Type Definition

-///

-typedef UINT32  EFI_STATUS_CODE_TYPE;

-

-//

-// A Status Code Type is made up of the code type and severity

-// All values masked by EFI_STATUS_CODE_RESERVED_MASK are

-// reserved for use by this specification.

-//

-#define EFI_STATUS_CODE_TYPE_MASK     0x000000FF

-#define EFI_STATUS_CODE_SEVERITY_MASK 0xFF000000

-#define EFI_STATUS_CODE_RESERVED_MASK 0x00FFFF00

-

-//

-// Definition of code types, all other values masked by

-// EFI_STATUS_CODE_TYPE_MASK are reserved for use by

-// this specification.

-//

-#define EFI_PROGRESS_CODE             0x00000001

-#define EFI_ERROR_CODE                0x00000002

-#define EFI_DEBUG_CODE                0x00000003

-

-//

-// Definitions of severities, all other values masked by

-// EFI_STATUS_CODE_SEVERITY_MASK are reserved for use by

-// this specification.

-// Uncontained errors are major errors that could not contained

-// to the specific component that is reporting the error

-// For example, if a memory error was not detected early enough,

-// the bad data could be consumed by other drivers.

-//

-#define EFI_ERROR_MINOR               0x40000000

-#define EFI_ERROR_MAJOR               0x80000000

-#define EFI_ERROR_UNRECOVERED         0x90000000

-#define EFI_ERROR_UNCONTAINED         0xa0000000

-

-///

-/// Status Code Value Definition

-///

-typedef UINT32 EFI_STATUS_CODE_VALUE;

-

-//

-// A Status Code Value is made up of the class, subclass, and

-// an operation.

-//

-#define EFI_STATUS_CODE_CLASS_MASK      0xFF000000

-#define EFI_STATUS_CODE_SUBCLASS_MASK   0x00FF0000

-#define EFI_STATUS_CODE_OPERATION_MASK  0x0000FFFF

-

-///

-/// Definition of Status Code extended data header.

-/// The data will follow HeaderSize bytes from the beginning of

-/// the structure and is Size bytes long.

-///

-typedef struct {

-  ///

-  /// The size of the structure. This is specified to enable future expansion.

-  ///

-  UINT16    HeaderSize;

-  ///

-  /// The size of the data in bytes. This does not include the size of the header structure.

-  ///

-  UINT16    Size;

-  ///

-  /// The GUID defining the type of the data.

-  ///

-  EFI_GUID  Type;

-} EFI_STATUS_CODE_DATA;

-

-

-///

-/// Bit values for Authentication Status

-///

-/// xx00 Image was not signed.

-/// xxx1 Platform security policy override. Assumes same meaning as 0010 (the image was signed, the

-///      signature was tested, and the signature passed authentication test).

-/// 0010 Image was signed, the signature was tested, and the signature passed authentication test.

-/// 0110 Image was signed and the signature was not tested.

-/// 1010 Image was signed, the signature was tested, and the signature failed the authentication test.

-///

-#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01

-#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02

-#define EFI_AUTH_STATUS_NOT_TESTED          0x04

-#define EFI_AUTH_STATUS_TEST_FAILED         0x08

-#define EFI_AUTH_STATUS_ALL                 0x0f

-

 #endif

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 89ab2dde33..1d0754db34 100644
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -1,7 +1,7 @@
 /** @file

   PI PEI master include file. This file should match the PI spec.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,6 +18,7 @@
 #ifndef __PI_PEICIS_H__

 #define __PI_PEICIS_H__

 

+#include <Uefi/UefiMultiPhase.h>

 #include <Pi/PiMultiPhase.h>

 

 ///

diff --git a/MdePkg/Include/Pi/PiStatusCode.h b/MdePkg/Include/Pi/PiStatusCode.h
new file mode 100644
index 0000000000..dc4b46176a
--- /dev/null
+++ b/MdePkg/Include/Pi/PiStatusCode.h
@@ -0,0 +1,108 @@
+/** @file

+  StatusCode related definitions in PI.

+

+  Copyright (c) 2009, Intel Corporation                                                         

+  All rights reserved. This program and the accompanying materials                          

+  are licensed and made available under the terms and conditions of the BSD License         

+  which accompanies this distribution.  The full text of the license may be found at        

+  http://opensource.org/licenses/bsd-license.php                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+  @par Revision Reference:

+  PI Version 1.0

+

+**/

+

+#ifndef __PI_STATUS_CODE_H__

+#define __PI_STATUS_CODE_H__

+

+///

+/// Status Code Type Definition

+///

+typedef UINT32  EFI_STATUS_CODE_TYPE;

+

+//

+// A Status Code Type is made up of the code type and severity

+// All values masked by EFI_STATUS_CODE_RESERVED_MASK are

+// reserved for use by this specification.

+//

+#define EFI_STATUS_CODE_TYPE_MASK     0x000000FF

+#define EFI_STATUS_CODE_SEVERITY_MASK 0xFF000000

+#define EFI_STATUS_CODE_RESERVED_MASK 0x00FFFF00

+

+//

+// Definition of code types, all other values masked by

+// EFI_STATUS_CODE_TYPE_MASK are reserved for use by

+// this specification.

+//

+#define EFI_PROGRESS_CODE             0x00000001

+#define EFI_ERROR_CODE                0x00000002

+#define EFI_DEBUG_CODE                0x00000003

+

+//

+// Definitions of severities, all other values masked by

+// EFI_STATUS_CODE_SEVERITY_MASK are reserved for use by

+// this specification.

+// Uncontained errors are major errors that could not contained

+// to the specific component that is reporting the error

+// For example, if a memory error was not detected early enough,

+// the bad data could be consumed by other drivers.

+//

+#define EFI_ERROR_MINOR               0x40000000

+#define EFI_ERROR_MAJOR               0x80000000

+#define EFI_ERROR_UNRECOVERED         0x90000000

+#define EFI_ERROR_UNCONTAINED         0xa0000000

+

+///

+/// Status Code Value Definition

+///

+typedef UINT32 EFI_STATUS_CODE_VALUE;

+

+//

+// A Status Code Value is made up of the class, subclass, and

+// an operation.

+//

+#define EFI_STATUS_CODE_CLASS_MASK      0xFF000000

+#define EFI_STATUS_CODE_SUBCLASS_MASK   0x00FF0000

+#define EFI_STATUS_CODE_OPERATION_MASK  0x0000FFFF

+

+///

+/// Definition of Status Code extended data header.

+/// The data will follow HeaderSize bytes from the beginning of

+/// the structure and is Size bytes long.

+///

+typedef struct {

+  ///

+  /// The size of the structure. This is specified to enable future expansion.

+  ///

+  UINT16    HeaderSize;

+  ///

+  /// The size of the data in bytes. This does not include the size of the header structure.

+  ///

+  UINT16    Size;

+  ///

+  /// The GUID defining the type of the data.

+  ///

+  EFI_GUID  Type;

+} EFI_STATUS_CODE_DATA;

+

+

+///

+/// Bit values for Authentication Status

+///

+/// xx00 Image was not signed.

+/// xxx1 Platform security policy override. Assumes same meaning as 0010 (the image was signed, the

+///      signature was tested, and the signature passed authentication test).

+/// 0010 Image was signed, the signature was tested, and the signature passed authentication test.

+/// 0110 Image was signed and the signature was not tested.

+/// 1010 Image was signed, the signature was tested, and the signature failed the authentication test.

+///

+#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01

+#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02

+#define EFI_AUTH_STATUS_NOT_TESTED          0x04

+#define EFI_AUTH_STATUS_TEST_FAILED         0x08

+#define EFI_AUTH_STATUS_ALL                 0x0f

+

+#endif

diff --git a/MdePkg/Include/PiPei.h b/MdePkg/Include/PiPei.h
index b95eba2765..6948914180 100644
--- a/MdePkg/Include/PiPei.h
+++ b/MdePkg/Include/PiPei.h
@@ -6,7 +6,7 @@
   modules only use types defined via this include file and can

   be ported easily to any environment. 

 

-Copyright (c) 2006 - 2007, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -22,8 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include <Uefi/UefiBaseType.h>

 #include <Pi/PiPeiCis.h>

-#include <Uefi/UefiMultiPhase.h>

-

 

 #endif

 

diff --git a/MdePkg/Include/Ppi/CpuIo.h b/MdePkg/Include/Ppi/CpuIo.h
index 5cb767a02f..e67a5a8f6a 100644
--- a/MdePkg/Include/Ppi/CpuIo.h
+++ b/MdePkg/Include/Ppi/CpuIo.h
@@ -2,7 +2,7 @@
   This PPI provides a set of memory- and I/O-based services. 

   The perspective of the services is that of the processor, not the bus or system.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -19,8 +19,6 @@
 #ifndef __PEI_CPUIO_PPI_H__

 #define __PEI_CPUIO_PPI_H__

 

-#include <Pi/PiPeiCis.h>

-

 #define EFI_PEI_CPU_IO_PPI_INSTALLED_GUID \

   { 0xe6af1f7b, 0xfc3f, 0x46da, {0xa8, 0x28, 0xa3, 0xb4, 0x57, 0xa4, 0x42, 0x82 } }

 

diff --git a/MdePkg/Include/Ppi/PciCfg2.h b/MdePkg/Include/Ppi/PciCfg2.h
index e8bc902471..384bdbac4a 100644
--- a/MdePkg/Include/Ppi/PciCfg2.h
+++ b/MdePkg/Include/Ppi/PciCfg2.h
@@ -4,7 +4,7 @@
   This ppi Provides platform or chipset-specific access to 

   the PCI configuration space for a specific PCI segment.

 

-  Copyright (c) 2006 - 2008, Intel Corporation

+  Copyright (c) 2006 - 2009, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -21,8 +21,6 @@
 #ifndef __PEI_PCI_CFG2_H__

 #define __PEI_PCI_CFG2_H__

 

-#include <Pi/PiPeiCis.h>

-

 #define EFI_PEI_PCI_CFG2_PPI_GUID \

   { 0x57a449a, 0x1fdc, 0x4c06, { 0xbf, 0xc9, 0xf5, 0x3f, 0x6a, 0x99, 0xbb, 0x92 } }

 

diff --git a/MdePkg/Include/Ppi/Reset.h b/MdePkg/Include/Ppi/Reset.h
index 105a3aaa22..0c8ce12c12 100644
--- a/MdePkg/Include/Ppi/Reset.h
+++ b/MdePkg/Include/Ppi/Reset.h
@@ -4,7 +4,7 @@
   This PPI is installed by some platform- or chipset-specific PEIM that 

   abstracts the Reset Service to other agents.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -21,8 +21,6 @@
 #ifndef __RESET_PPI_H__

 #define __RESET_PPI_H__

 

-#include <Pi/PiPeiCis.h>

-

 #define EFI_PEI_RESET_PPI_GUID \

   { \

     0xef398d58, 0x9dfd, 0x4103, {0xbf, 0x94, 0x78, 0xc6, 0xf4, 0xfe, 0x71, 0x2f } \

diff --git a/MdePkg/Include/Ppi/StatusCode.h b/MdePkg/Include/Ppi/StatusCode.h
index c74cd835a7..4a82b26607 100644
--- a/MdePkg/Include/Ppi/StatusCode.h
+++ b/MdePkg/Include/Ppi/StatusCode.h
@@ -2,7 +2,7 @@
   This file declares Status Code PPI.

   This ppi provides service that allows PEIMs to report status codes.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -19,8 +19,6 @@
 #ifndef __STATUS_CODE_PPI_H__

 #define __STATUS_CODE_PPI_H__

 

-#include <Pi/PiPeiCis.h>

-

 #define EFI_PEI_REPORT_PROGRESS_CODE_PPI_GUID \

   { 0x229832d3, 0x7a30, 0x4b36, {0xb8, 0x27, 0xf4, 0xc, 0xb7, 0xd4, 0x54, 0x36 } }

 

diff --git a/MdePkg/Include/Protocol/DebugSupport.h b/MdePkg/Include/Protocol/DebugSupport.h
index deb9c29016..8f9ea4831c 100644
--- a/MdePkg/Include/Protocol/DebugSupport.h
+++ b/MdePkg/Include/Protocol/DebugSupport.h
@@ -19,7 +19,6 @@
 #ifndef __DEBUG_SUPPORT_H__

 #define __DEBUG_SUPPORT_H__

 

-#include <ProcessorBind.h>

 #include <IndustryStandard/PeImage.h>

 

 typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL;

diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index b796d120a9..6f4e73887f 100644
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -4,7 +4,7 @@
   Abstraction of a very simple input device like a keyboard or serial

   terminal.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,8 +18,6 @@
 #ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__

 #define __SIMPLE_TEXT_IN_PROTOCOL_H__

 

-#include <ProcessorBind.h>

-

 #define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \

   { \

     0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \

diff --git a/MdePkg/Include/Protocol/SimpleTextInEx.h b/MdePkg/Include/Protocol/SimpleTextInEx.h
index 95c5995ce8..430ec601be 100644
--- a/MdePkg/Include/Protocol/SimpleTextInEx.h
+++ b/MdePkg/Include/Protocol/SimpleTextInEx.h
@@ -4,7 +4,7 @@
   EFI_SIMPLE_TEXT_INPUT_PROTOCOL supports the same languages as

   the corresponding

 

-  Copyright (c) 2006 - 2008, Intel Corporation 

+  Copyright (c) 2006 - 2009, Intel Corporation 

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -18,9 +18,6 @@
 #ifndef __SIMPLE_TEXT_IN_EX_H__

 #define __SIMPLE_TEXT_IN_EX_H__

 

-#include <ProcessorBind.h>

-#include <Pi/PiMultiPhase.h>

-

 #define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \

   {0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } }

 

diff --git a/MdePkg/Include/Protocol/StatusCode.h b/MdePkg/Include/Protocol/StatusCode.h
index 70fa619ba8..25c1f0dbf8 100644
--- a/MdePkg/Include/Protocol/StatusCode.h
+++ b/MdePkg/Include/Protocol/StatusCode.h
@@ -9,7 +9,7 @@
 

   This code abstracts Status Code reporting.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -23,8 +23,6 @@
 #ifndef __STATUS_CODE_RUNTIME_PROTOCOL_H__

 #define __STATUS_CODE_RUNTIME_PROTOCOL_H__

 

-#include <Pi/PiMultiPhase.h>

-

 #define EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID  \

 { 0xd2b2b828, 0x826, 0x48a7,  { 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0 } }

 

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index d297183d8a..f82a8ae792 100644
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file

   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2009, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -15,8 +15,6 @@
 #ifndef __UEFI_MULTIPHASE_H__

 #define __UEFI_MULTIPHASE_H__

 

-#include <ProcessorBind.h>

-

 ///

 /// Enumeration of memory types introduced in UEFI.

 ///