Modified header files to make them compile

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

34 files changed, 122 insertions, 61 deletions

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
index 1571e3d..a9845e9 100644
--- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, 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.             

+Copyright (c) 2006, 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.

 

 Module Name:

 

@@ -15,12 +15,14 @@ Module Name:
 

 Abstract:

 

-  

+

 --*/

 

 #ifndef _ACPI_S3_SAVE_PROTOCOL_H

 #define _ACPI_S3_SAVE_PROTOCOL_H

 

+#include <PiDxe.h>

+

 //

 // Forward reference for pure ANSI compatability

 //

@@ -41,11 +43,11 @@ typedef
 EFI_STATUS

 (EFIAPI *EFI_ACPI_S3_SAVE) (

   IN EFI_ACPI_S3_SAVE_PROTOCOL      * This,

-  IN VOID                           * LegacyMemoryAddress 

+  IN VOID                           * LegacyMemoryAddress

   );

 

-typedef 

-EFI_STATUS  

+typedef

+EFI_STATUS

 (EFIAPI *EFI_ACPI_GET_LEGACY_MEMORY_SIZE) (

   IN  EFI_ACPI_S3_SAVE_PROTOCOL     * This,

   OUT UINTN                         * Size

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
index b0fa68e..8955e8e 100644
--- a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
@@ -20,6 +20,8 @@
 #ifndef _ACPI_SUPPORT_PROTOCOL_H_

 #define _ACPI_SUPPORT_PROTOCOL_H_

 

+#include <PiDxe.h>

+

 typedef struct _EFI_ACPI_SUPPORT_PROTOCOL EFI_ACPI_SUPPORT_PROTOCOL;

 

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
index fc34723..f002b60 100644
--- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
+++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
@@ -20,6 +20,8 @@
 #ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H

 #define _BOOT_SCRIPT_SAVE_PROTOCOL_H

 

+#include <PiDxe.h>

+

 //

 // S3 Save Protocol GUID

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/CpuIo.h b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
index 38f910e..f6c91df 100644
--- a/IntelFrameworkPkg/Include/Protocol/CpuIo.h
+++ b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
@@ -21,6 +21,8 @@
 #ifndef _CPUIO_H_

 #define _CPUIO_H_

 

+#include <PiDxe.h>

+

 #define EFI_CPU_IO_PROTOCOL_GUID \

   { \

     0xB0732526, 0x38C8, 0x4b40, {0x88, 0x77, 0x61, 0xC7, 0xB0, 0x6A, 0xAC, 0x45 } \

diff --git a/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h
index f6f156a..5c8b61f 100644
--- a/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h
@@ -1,19 +1,19 @@
 /** @file

   This file declares GUIDed section extraction protocol.

 

-  This interface provides a means of decoding a GUID defined encapsulation 

+  This interface provides a means of decoding a GUID defined encapsulation

   section. There may be multiple different GUIDs associated with the GUIDed

   section extraction protocol. That is, all instances of the GUIDed section

   extraction protocol must have the same interface structure.

 

-  Copyright (c) 2006, 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                                            

+  Copyright (c) 2006, 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.             

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

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

 

   Module Name:  GuidedSectionExtraction.h

 

@@ -26,6 +26,7 @@
 #ifndef __CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

 #define __CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

 

+#include <PiPei.h>

 

 //

 // Protocol GUID definition. Each GUIDed section extraction protocol has the

diff --git a/IntelFrameworkPkg/Include/Protocol/DataHub.h b/IntelFrameworkPkg/Include/Protocol/DataHub.h
index 8af0964..a7ea348 100644
--- a/IntelFrameworkPkg/Include/Protocol/DataHub.h
+++ b/IntelFrameworkPkg/Include/Protocol/DataHub.h
@@ -26,6 +26,8 @@
 #ifndef _DATA_HUB_H_

 #define _DATA_HUB_H_

 

+#include <PiDxe.h>

+

 #define EFI_DATA_HUB_PROTOCOL_GUID \

   { \

     0xae80d021, 0x618e, 0x11d4, {0xbc, 0xd7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
index 50c53d5..d8fa30b 100644
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -21,6 +21,7 @@
 #ifndef _FIRMWARE_VOLUME_H_

 #define _FIRMWARE_VOLUME_H_

 

+#include <PiDxe.h>

 

 //

 // Firmware Volume Protocol GUID definition

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h
index f397f59..04d5baa 100644
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h
@@ -24,6 +24,7 @@
 #ifndef _FIRMWARE_VOLUME_BLOCK_H_

 #define _FIRMWARE_VOLUME_BLOCK_H_

 

+#include <PiDxe.h>

 

 #define EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h
index 249a476..e976f37 100644
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h
@@ -1,17 +1,17 @@
 /** @file

   This file declares Firmware Volume Dispatch protocol.

 

-  Presence of this protocol tells the dispatch to dispatch from this Firmware 

+  Presence of this protocol tells the dispatch to dispatch from this Firmware

   Volume

 

-  Copyright (c) 2006, 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                                            

+  Copyright (c) 2006, 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.             

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

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

 

   Module Name:  FirmwareVolumeDispatch.h

 

@@ -24,6 +24,8 @@
 #ifndef __FIRMWARE_VOLUME_DISPATCH_H__

 #define __FIRMWARE_VOLUME_DISPATCH_H__

 

+#include <PiDxe.h>

+

 #define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \

   { 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } }

 

diff --git a/IntelFrameworkPkg/Include/Protocol/FormCallback.h b/IntelFrameworkPkg/Include/Protocol/FormCallback.h
index 8845864..7402913 100644
--- a/IntelFrameworkPkg/Include/Protocol/FormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FormCallback.h
@@ -1,18 +1,18 @@
 /** @file

-  The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to custom 

-  NV storage devices as well as communication of user selections in a more 

-  interactive environment.  This protocol should be published by hardware 

-  specific drivers which want to export access to custom hardware storage or 

+  The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to custom

+  NV storage devices as well as communication of user selections in a more

+  interactive environment.  This protocol should be published by hardware

+  specific drivers which want to export access to custom hardware storage or

   publish IFR which has a requirement to call back the original driver.

 

-  Copyright (c) 2006, 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                                            

+  Copyright (c) 2006, 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.             

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

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

 

   Module Name:  FormCallback.h

 

@@ -24,6 +24,7 @@
 #ifndef __FORM_CALLBACK_H__

 #define __FORM_CALLBACK_H__

 

+#include <PiDxe.h>

 

 #define EFI_FORM_CALLBACK_PROTOCOL_GUID \

   { \

@@ -86,7 +87,7 @@ typedef struct {
 // The following types are currently defined:

 //

 /**

-  Returns the value of a variable. 

+  Returns the value of a variable.

 

   @param  This                  A pointer to the EFI_FORM_CALLBACK_PROTOCOL instance.

   @param  VariableName          A NULL-terminated Unicode string that is the

@@ -118,7 +119,7 @@ EFI_STATUS
   );

 

 /**

-  Sets the value of a variable. 

+  Sets the value of a variable.

 

   @param  This                  A pointer to the EFI_FORM_CALLBACK_PROTOCOL instance.

   @param  VariableName          A NULL-terminated Unicode string that is the

@@ -155,7 +156,7 @@ EFI_STATUS
   );

 

 /**

-  This function is called to provide results data to the driver. 

+  This function is called to provide results data to the driver.

 

   @param  This                  A pointer to the EFI_FORM_CALLBACK_PROTOCOL instance.

   @param  KeyValue              A unique value which is sent to the original exporting

@@ -179,10 +180,10 @@ EFI_STATUS
 

 /**

   @par Protocol Description:

-  The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to 

-  custom NVS devices as well as communication of user selections in a more 

-  interactive environment. This protocol should be published by hardware-specific 

-  drivers that want to export access to custom hardware storage or publish IFR 

+  The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to

+  custom NVS devices as well as communication of user selections in a more

+  interactive environment. This protocol should be published by hardware-specific

+  drivers that want to export access to custom hardware storage or publish IFR

   that has a requirement to call back the original driver.

 

   @param NvRead

@@ -192,7 +193,7 @@ EFI_STATUS
   The write operation to access the NV data serviced by a hardware-specific driver.

 

   @param Callback

-  The function that is called from the configuration browser to communicate key value pairs. 

+  The function that is called from the configuration browser to communicate key value pairs.

 

 **/

 struct _EFI_FORM_CALLBACK_PROTOCOL {

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index 0cb71eb..ae3d379 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -22,6 +22,8 @@
 #ifndef _FRAMEWORK_HII_H_

 #define _FRAMEWORK_HII_H_

 

+#include <PiDxe.h>

+

 //

 // To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL,

 // is defined in MdePkg/Protocol/GraphicsOutput.h

diff --git a/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h
index 8368e28..0bf6efc 100644
--- a/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h
@@ -1,19 +1,19 @@
 /** @file

   This file declares GUIDed section extraction protocol.

 

-  This interface provides a means of decoding a GUID defined encapsulation 

+  This interface provides a means of decoding a GUID defined encapsulation

   section. There may be multiple different GUIDs associated with the GUIDed

   section extraction protocol. That is, all instances of the GUIDed section

   extraction protocol must have the same interface structure.

 

-  Copyright (c) 2006, 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                                            

+  Copyright (c) 2006, 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.             

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

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

 

   Module Name:  GuidedSectionExtraction.h

 

@@ -26,6 +26,7 @@
 #ifndef __GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

 #define __GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

 

+#include <PiDxe.h>

 

 //

 // Protocol GUID definition. Each GUIDed section extraction protocol has the

@@ -46,7 +47,7 @@ typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  EFI_GUIDED_SECTION_EXTRA
 // Protocol member functions

 //

 /**

-  Processes the input section and returns the data contained therein along 

+  Processes the input section and returns the data contained therein along

   with the authentication status.

 

   @param  This                  Indicates the EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL instance.

@@ -57,7 +58,7 @@ typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  EFI_GUIDED_SECTION_EXTRA
                                 of *OutputBuffer allocation is stored.

   @param  AuthenticationStatus  A pointer to a caller-allocated UINT32 that

                                 indicates the authentication status of the output buffer.

-                                

+

   @retval EFI_SUCCESS           The InputSection was successfully processed and the

                                 section contents were returned.

   @retval EFI_OUT_OF_RESOURCES  The system has insufficient resources to

@@ -82,12 +83,12 @@ EFI_STATUS
 //

 /**

   @par Protocol Description:

-  If a GUID-defined section is encountered when doing section extraction, 

-  the section extraction driver calls the appropriate instance of the GUIDed 

+  If a GUID-defined section is encountered when doing section extraction,

+  the section extraction driver calls the appropriate instance of the GUIDed

   Section Extraction Protocol to extract the section stream contained therein.

 

   @param ExtractSection

-  Takes the GUIDed section as input and produces the section stream data. 

+  Takes the GUIDed section as input and produces the section stream data.

 

 **/

 struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL {

diff --git a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
index 1f8b515..aef6a2e 100644
--- a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_

 #define _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the EFI Platform IDE Protocol GUID

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
index c684f15..0c45fb7 100644
--- a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
@@ -21,6 +21,8 @@
 #ifndef _INCOMPATIBLE_PCI_DEVICE_SUPPORT_H_

 #define _INCOMPATIBLE_PCI_DEVICE_SUPPORT_H_

 

+#include <PiDxe.h>

+

 #define EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL_GUID \

         {0xeb23f55a, 0x7863, 0x4ac2, {0x8d, 0x3d, 0x95, 0x65, 0x35, 0xde, 0x03, 0x75} }

 

diff --git a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
index e9f9173..ffd184c 100644
--- a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
+++ b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
@@ -22,6 +22,8 @@
 #ifndef _EFI_LEGACY_8259_H_

 #define _EFI_LEGACY_8259_H_

 

+#include <PiDxe.h>

+

 #define EFI_LEGACY_8259_PROTOCOL_GUID \

   { \

     0x38321dba, 0x4fe0, 0x4e17, {0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1 } \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
index 1d11d95..0df87db 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
@@ -32,6 +32,8 @@
 #ifndef _EFI_LEGACY_BIOS_H_

 #define _EFI_LEGACY_BIOS_H_

 

+#include <FrameworkDxe.h>

+

 #define EFI_LEGACY_BIOS_PROTOCOL_GUID \

   { \

     0xdb9a1e3d, 0x45cb, 0x4abb, {0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d } \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
index 4eaa3da..3bc9f5d 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
@@ -24,6 +24,8 @@
 #ifndef _EFI_LEGACY_BIOS_PLATFORM_H_

 #define _EFI_LEGACY_BIOS_PLATFORM_H_

 

+#include <FrameworkDxe.h>

+

 #define EFI_LEGACY_BIOS_PLATFORM_PROTOCOL_GUID \

   { \

     0x783658a3, 0x4172, 0x4421, {0xa2, 0x99, 0xe0, 0x9, 0x7, 0x9c, 0xc, 0xb4 } \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
index 13ac36f..0ebbc51 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_LEGACY_INTERRUPT_H_

 #define _EFI_LEGACY_INTERRUPT_H_

 

+#include <PiDxe.h>

+

 #define EFI_LEGACY_INTERRUPT_PROTOCOL_GUID \

   { \

     0x31ce593d, 0x108a, 0x485d, {0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe } \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
index ede3a6c..b819f80 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_LEGACY_REGION_H_

 #define _EFI_LEGACY_REGION_H_

 

+#include <PiDxe.h>

+

 #define EFI_LEGACY_REGION_PROTOCOL_GUID \

   { \

     0xfc9013a, 0x568, 0x4ba9, {0x9b, 0x7e, 0xc9, 0xc3, 0x90, 0xa6, 0x60, 0x9b } \

diff --git a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
index adafd73..33b4c34 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
@@ -21,6 +21,7 @@
 #ifndef _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_

 #define _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_

 

+#include <PiDxe.h>

 #include <Protocol/PciRootBridgeIo.h>

 

 #define EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GUID \

diff --git a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
index 577a4dd..1772450 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_PCI_HOT_PLUG_INIT_H_

 #define _EFI_PCI_HOT_PLUG_INIT_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the PCI Hot Plug Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
index f86ea51..87a0288 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
@@ -21,6 +21,9 @@
 #ifndef _PCI_PLATFORM_H_

 #define _PCI_PLATFORM_H_

 

+#include <PiDxe.h>

+#include <Protocol/PciHostBridgeResourceAllocation.h>

+

 //

 // Protocol for GUID.

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
index 964cf4b..cdf8f06 100644
--- a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
@@ -24,6 +24,7 @@
 #ifndef _SECTION_EXTRACTION_PROTOCOL_H_

 #define _SECTION_EXTRACTION_PROTOCOL_H_

 

+#include <PiDxe.h>

 

 //

 // Protocol GUID definition

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
index 700eb25..df7a87e 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
@@ -20,7 +20,8 @@
 #ifndef _SMM_ACCESS_H_

 #define _SMM_ACCESS_H_

 

-#include <SmramMemoryReserve.h>

+#include <PiDxe.h>

+#include <Guid/SmramMemoryReserve.h>

 

 typedef struct _EFI_SMM_ACCESS_PROTOCOL  EFI_SMM_ACCESS_PROTOCOL;

 

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmBase.h b/IntelFrameworkPkg/Include/Protocol/SmmBase.h
index be21473..ab14f1c 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmBase.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmBase.h
@@ -22,6 +22,8 @@
 #ifndef _SMM_BASE_H_

 #define _SMM_BASE_H_

 

+#include <FrameworkSmm.h>

+

 #define EFI_SMM_BASE_PROTOCOL_GUID \

   { \

     0x1390954D, 0xda95, 0x4227, {0x93, 0x28, 0x72, 0x82, 0xc2, 0x17, 0xda, 0xa8 } \

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmControl.h b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
index 51bc5bf..2dbf412 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmControl.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
@@ -21,6 +21,8 @@
 #ifndef _SMM_CONTROL_H_

 #define _SMM_CONTROL_H_

 

+#include <PiDxe.h>

+

 typedef struct _EFI_SMM_CONTROL_PROTOCOL              EFI_SMM_CONTROL_PROTOCOL;

 

 #define EFI_SMM_CONTROL_PROTOCOL_GUID \

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
index 7454bcc..c6cdf60 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_GPI_DISPATCH_H_

 #define _EFI_SMM_GPI_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the GPI SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
index 34185e8..e4bf737 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_ICHN_DISPATCH_H_

 #define _EFI_SMM_ICHN_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the ICH SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
index 1f343a8..dbc05ed 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_PERIODIC_TIMER_DISPATCH_H_

 #define _EFI_SMM_PERIODIC_TIMER_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the Periodic Timer SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
index c2c7b28..01b87c3 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_POWER_BUTTON_DISPATCH_H_

 #define _EFI_SMM_POWER_BUTTON_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the Power Button SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
index 8753808..3770154 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_

 #define _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the Standby Button SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
index e003fb7..cb82a3c 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_SW_DISPATCH_H_

 #define _EFI_SMM_SW_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the SW SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
index e7621cd..66f0594 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
@@ -21,6 +21,8 @@
 #ifndef _EFI_SMM_SX_DISPATCH_H_

 #define _EFI_SMM_SX_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the Sx SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
index e87619d..741b0a1 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
@@ -20,6 +20,8 @@
 #ifndef _EFI_SMM_USB_DISPATCH_H_

 #define _EFI_SMM_USB_DISPATCH_H_

 

+#include <PiDxe.h>

+

 //

 // Global ID for the USB Protocol

 //