Clean the public header files to remove the unnecessary include files.

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

58 files changed, 18 insertions, 92 deletions

diff --git a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
index b1157bafd3..e613fa143a 100644
--- a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
@@ -24,9 +24,7 @@
 #ifndef _DATAHUB_RECORDS_H_

 #define _DATAHUB_RECORDS_H_

 

-#include <PiPei.h>

-#include <Protocol/DevicePath.h>

-#include <Protocol/FrameworkHii.h>

+#include <Framework/FrameworkInternalFormRepresentation.h>

 

 #define EFI_PROCESSOR_SUBCLASS_VERSION    0x0100

 

diff --git a/IntelFrameworkPkg/Include/Framework/DxeCis.h b/IntelFrameworkPkg/Include/Framework/DxeCis.h
index efc7ae807f..f0f8f7e295 100644
--- a/IntelFrameworkPkg/Include/Framework/DxeCis.h
+++ b/IntelFrameworkPkg/Include/Framework/DxeCis.h
@@ -16,8 +16,6 @@
 #ifndef _DXE_CIS_H_

 #define _DXE_CIS_H_

 

-#include <PiDxe.h>

-#include <Framework/StatusCode.h>

 #include <Protocol/StatusCode.h>

 

 //

diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
index 4daf27ca56..f261fa347e 100644
--- a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
+++ b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
@@ -20,6 +20,8 @@
 #ifndef __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__

 #define __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__

 

+typedef UINT16  STRING_REF;

+

 //

 // IFR Op codes

 //

diff --git a/IntelFrameworkPkg/Include/Framework/Hob.h b/IntelFrameworkPkg/Include/Framework/Hob.h
index c8e9914a7e..f76cff1148 100644
--- a/IntelFrameworkPkg/Include/Framework/Hob.h
+++ b/IntelFrameworkPkg/Include/Framework/Hob.h
@@ -20,8 +20,6 @@
 #ifndef _FRAMEWORK_HOB_H_

 #define _FRAMEWORK_HOB_H_

 

-#include <PiPei.h>

-

 ///

 /// Capsule volume HOB -- identical to a firmware volume

 /// This macro is defined  to comply with hob Framework Spec. And the marco has been

diff --git a/IntelFrameworkPkg/Include/Framework/Legacy16.h b/IntelFrameworkPkg/Include/Framework/Legacy16.h
index 533782c7fd..630880016b 100644
--- a/IntelFrameworkPkg/Include/Framework/Legacy16.h
+++ b/IntelFrameworkPkg/Include/Framework/Legacy16.h
@@ -25,8 +25,6 @@
 #ifndef _FRAMEWORK_LEGACY_16_H_
 #define _FRAMEWORK_LEGACY_16_H_
 
-#include <Base.h>
-
 #pragma pack(1)
 
 typedef UINT8                       SERIAL_MODE;
diff --git a/IntelFrameworkPkg/Include/Framework/PeiCis.h b/IntelFrameworkPkg/Include/Framework/PeiCis.h
index 5dc2f9c529..db0b185a1f 100644
--- a/IntelFrameworkPkg/Include/Framework/PeiCis.h
+++ b/IntelFrameworkPkg/Include/Framework/PeiCis.h
@@ -16,7 +16,6 @@
 #ifndef __PEICIS_H__

 #define __PEICIS_H__

 

-#include <PiPei.h>

 #include <Ppi/PciCfg.h>

 //

 // Framework PEI Specification Revision information

diff --git a/IntelFrameworkPkg/Include/Framework/SmmCis.h b/IntelFrameworkPkg/Include/Framework/SmmCis.h
index 59a660c3a9..11d6a6b07e 100644
--- a/IntelFrameworkPkg/Include/Framework/SmmCis.h
+++ b/IntelFrameworkPkg/Include/Framework/SmmCis.h
@@ -16,8 +16,6 @@
 #ifndef _FRAMEWORK_SMM_CIS_H_

 #define _FRAMEWORK_SMM_CIS_H_

 

-#include <Framework/DxeCis.h>

-

 #define EFI_SMM_CPU_IO_GUID \

   { \

     0x5f439a0b, 0x45d8, 0x4682, {0xa4, 0xf4, 0xf0, 0x57, 0x6b, 0x51, 0x34, 0x41 } \

diff --git a/IntelFrameworkPkg/Include/Framework/StatusCode.h b/IntelFrameworkPkg/Include/Framework/StatusCode.h
index b3a1cf48f8..5c15c5b795 100644
--- a/IntelFrameworkPkg/Include/Framework/StatusCode.h
+++ b/IntelFrameworkPkg/Include/Framework/StatusCode.h
@@ -34,8 +34,6 @@
 #ifndef _FRAMEWORK_STATUS_CODE_H_

 #define _FRAMEWORK_STATUS_CODE_H_

 

-#include <PiPei.h>

-

 //

 // Section 1

 // Class definitions

diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h
index 098adae1e0..a88bd0cf5b 100644
--- a/IntelFrameworkPkg/Include/FrameworkDxe.h
+++ b/IntelFrameworkPkg/Include/FrameworkDxe.h
@@ -19,10 +19,15 @@
 #ifndef _FRAMEWORK_DXE_H_

 #define _FRAMEWORK_DXE_H_

 

-#include <FrameworkPei.h>

-

-#include <Framework/DxeCis.h>

+#include <PiDxe.h>

 

 #include <Framework/FrameworkInternalFormRepresentation.h>

+#include <Framework/DataHubRecords.h>

+#include <Framework/FirmwareVolumeImageFormat.h>

+#include <Framework/FirmwareVolumeHeader.h>

+#include <Framework/Hob.h>

+#include <Framework/Legacy16.h>

+#include <Framework/StatusCode.h>

+#include <Framework/DxeCis.h>

 

 #endif

diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index b5e5770b41..9455fd8e40 100644
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,12 +22,10 @@
 

 #include <PiPei.h>

 

-#include <Framework/PeiCis.h>

-#include <Framework/DataHubRecords.h>

 #include <Framework/FirmwareVolumeImageFormat.h>

 #include <Framework/FirmwareVolumeHeader.h>

 #include <Framework/Hob.h>

-#include <Framework/Legacy16.h>

 #include <Framework/StatusCode.h>

+#include <Framework/PeiCis.h>

 

 #endif

diff --git a/IntelFrameworkPkg/Include/Guid/Capsule.h b/IntelFrameworkPkg/Include/Guid/Capsule.h
index 90c82cb20e..53fb956fe6 100644
--- a/IntelFrameworkPkg/Include/Guid/Capsule.h
+++ b/IntelFrameworkPkg/Include/Guid/Capsule.h
@@ -17,8 +17,6 @@
 #ifndef _CAPSULE_GUID_H__

 #define _CAPSULE_GUID_H__

 

-#include <PiPei.h>

-

 //

 // This is the GUID of the capsule header of the image on disk.

 //

diff --git a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
index 2c49758865..fd7cc051d2 100644
--- a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
@@ -17,7 +17,7 @@
 #ifndef _DATAHUB_RECORDS_GUID_H_

 #define _DATAHUB_RECORDS_GUID_H_

 

-#include <PiPei.h>

+#include <Framework/DataHubRecords.h>

 

 #define EFI_PROCESSOR_SUBCLASS_GUID \

   { 0x26fdeb7e, 0xb8af, 0x4ccf, {0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 } }

diff --git a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
index a27a8a2a85..7bcd7930be 100644
--- a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
+++ b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
@@ -21,8 +21,6 @@
 #ifndef __FIRMWARE_FILE_SYSTEM_GUID_H__

 #define __FIRMWARE_FILE_SYSTEM_GUID_H__

 

-#include <PiPei.h>

-

 ///

 /// GUIDs defined by the FFS specification.

 ///

diff --git a/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h b/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h
index e03d5993ef..44046ed8ee 100644
--- a/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h
+++ b/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h
@@ -21,8 +21,6 @@
 #ifndef _SMM_COMMUNICATE_GUID_H_

 #define _SMM_COMMUNICATE_GUID_H_

 

-#include <PiPei.h>

-

 ///

 /// Inconsistent with specification here: 

 /// GUID definition format has been changed, because the GUID format in Framework spec is incorrect.

diff --git a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
index 0fb4ba12e2..8dece94a94 100644
--- a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
+++ b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
@@ -25,8 +25,6 @@
 #ifndef _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_

 #define _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_

 

-#include <PiPei.h>

-

 #define EFI_SMM_PEI_SMRAM_MEMORY_RESERVE \

   { \

     0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } \

diff --git a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
index f0193711f8..991cd2d1db 100644
--- a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
@@ -20,9 +20,7 @@
 #ifndef __STATUS_CODE_DATA_TYPE_ID_GUID_H__

 #define __STATUS_CODE_DATA_TYPE_ID_GUID_H__

 

-#include <PiPei.h>

 #include <Framework/StatusCode.h>

-#include <Framework/DataHubRecords.h>

 #include <Protocol/DebugSupport.h>

 #include <Protocol/FrameworkHii.h>

 

diff --git a/IntelFrameworkPkg/Include/Ppi/BlockIo.h b/IntelFrameworkPkg/Include/Ppi/BlockIo.h
index 0134776ced..3b02f4016f 100644
--- a/IntelFrameworkPkg/Include/Ppi/BlockIo.h
+++ b/IntelFrameworkPkg/Include/Ppi/BlockIo.h
@@ -21,8 +21,6 @@
 #ifndef _PEI_BLOCK_IO_H_

 #define _PEI_BLOCK_IO_H_

 

-#include <PiPei.h>

-

 #define EFI_PEI_IDE_BLOCK_IO_PPI \

   { \

     0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }  \

diff --git a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h
index bb1058ed78..f66b913e68 100644
--- a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h
+++ b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h
@@ -28,7 +28,7 @@
 #ifndef _PEI_BOOT_SCRIPT_EXECUTER_PPI_H_

 #define _PEI_BOOT_SCRIPT_EXECUTER_PPI_H_

 

-#include <PiPei.h>

+#include <FrameworkPei.h>

 

 #define EFI_ACPI_S3_RESUME_SCRIPT_TABLE               0x00

 

diff --git a/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h b/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h
index 1113aa48c2..7847b51079 100644
--- a/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h
+++ b/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h
@@ -26,8 +26,6 @@
 #ifndef _PEI_DEVICE_RECOVERY_MODULE_PPI_H_

 #define _PEI_DEVICE_RECOVERY_MODULE_PPI_H_

 

-#include <PiPei.h>

-

 #define EFI_PEI_DEVICE_RECOVERY_MODULE_PPI_GUID \

   { \

     0x0DE2CE25, 0x446A, 0x45a7, {0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37 } \

diff --git a/IntelFrameworkPkg/Include/Ppi/FindFv.h b/IntelFrameworkPkg/Include/Ppi/FindFv.h
index f36580ed00..0ddeb4d0f2 100644
--- a/IntelFrameworkPkg/Include/Ppi/FindFv.h
+++ b/IntelFrameworkPkg/Include/Ppi/FindFv.h
@@ -21,8 +21,6 @@
 #ifndef _FIND_FV_H_

 #define _FIND_FV_H_

 

-#include <PiPei.h>

-

 ///

 ///  Inconsistent with specification here: 

 ///  GUID value format has been changed to the standard guid format.

diff --git a/IntelFrameworkPkg/Include/Ppi/PciCfg.h b/IntelFrameworkPkg/Include/Ppi/PciCfg.h
index 3f4398a3c6..6b9f98990e 100644
--- a/IntelFrameworkPkg/Include/Ppi/PciCfg.h
+++ b/IntelFrameworkPkg/Include/Ppi/PciCfg.h
@@ -21,11 +21,10 @@
 #ifndef __PEI_PCI_CFG_H__

 #define __PEI_PCI_CFG_H__

 

-#include <Pi/PiPeiCis.h>

+#include <Ppi/PciCfg2.h>

 //

 // Get the common definitions for EFI_PEI_PCI_CFG_PPI_WIDTH.

 //

-#include <Ppi/PciCfg2.h>

 

 #define EFI_PEI_PCI_CFG_PPI_INSTALLED_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h b/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h
index 2a1b76ab26..30015604af 100644
--- a/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h
+++ b/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h
@@ -21,8 +21,6 @@
 #ifndef __PEI_READ_ONLY_VARIABLE_PPI_H__

 #define __PEI_READ_ONLY_VARIABLE_PPI_H__

 

-#include <PiPei.h>

-

 #define EFI_PEI_READ_ONLY_VARIABLE_ACCESS_PPI_GUID \

   { \

     0x3cdc90c6, 0x13fb, 0x4a75, {0x9e, 0x79, 0x59, 0xe9, 0xdd, 0x78, 0xb9, 0xfa } \

diff --git a/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h b/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h
index 7c993d494d..e381647fac 100644
--- a/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h
+++ b/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h
@@ -22,8 +22,6 @@
 #ifndef __PEI_RECOVERY_MODULE_PPI_H__

 #define __PEI_RECOVERY_MODULE_PPI_H__

 

-#include <PiPei.h>

-

 ///

 ///  Inconsistent with specification here: 

 ///  GUID marco name has been changed to the consistent PPI GUID macro name.

diff --git a/IntelFrameworkPkg/Include/Ppi/S3Resume.h b/IntelFrameworkPkg/Include/Ppi/S3Resume.h
index 2509eb53b6..9259a16b6a 100644
--- a/IntelFrameworkPkg/Include/Ppi/S3Resume.h
+++ b/IntelFrameworkPkg/Include/Ppi/S3Resume.h
@@ -37,8 +37,6 @@
 #ifndef __PEI_S3_RESUME_PPI_H__

 #define __PEI_S3_RESUME_PPI_H__

 

-#include <PiPei.h>

-

 #define EFI_PEI_S3_RESUME_PPI_GUID \

   { \

     0x4426CCB2, 0xE684, 0x4a8a, {0xAE, 0x40, 0x20, 0xD4, 0xB0, 0x25, 0xB7, 0x10 } \

diff --git a/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h b/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h
index e5daf149c1..4489c18ba2 100644
--- a/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h
@@ -18,8 +18,6 @@
 #ifndef __SECTION_EXTRACTION_H__

 #define __SECTION_EXTRACTION_H__

 

-#include <PiPei.h>

-

 #define EFI_PEI_SECTION_EXTRACTION_PPI_GUID \

   { \

     0x4F89E208, 0xE144, 0x4804, {0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 } \

diff --git a/IntelFrameworkPkg/Include/Ppi/Security.h b/IntelFrameworkPkg/Include/Ppi/Security.h
index 48a99a84cc..60c15e6cfa 100644
--- a/IntelFrameworkPkg/Include/Ppi/Security.h
+++ b/IntelFrameworkPkg/Include/Ppi/Security.h
@@ -25,8 +25,6 @@
 #ifndef __SECURITY_PPI_H__

 #define __SECURITY_PPI_H__

 

-#include <PiPei.h>

-

 #define EFI_PEI_SECURITY_PPI_GUID \

   { \

     0x1388066e, 0x3a57, 0x4efa, {0x98, 0xf3, 0xc1, 0x2f, 0x3a, 0x95, 0x8a, 0x29 } \

diff --git a/IntelFrameworkPkg/Include/Ppi/Smbus.h b/IntelFrameworkPkg/Include/Ppi/Smbus.h
index 5b7c6274ed..3833937adb 100644
--- a/IntelFrameworkPkg/Include/Ppi/Smbus.h
+++ b/IntelFrameworkPkg/Include/Ppi/Smbus.h
@@ -20,7 +20,6 @@
 #ifndef _PEI_SMBUS_PPI_H_

 #define _PEI_SMBUS_PPI_H_

 

-#include <PiPei.h>

 #include <Ppi/Smbus2.h>

 

 #define EFI_PEI_SMBUS_PPI_GUID \

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
index 6c80469356..0e095f8148 100644
--- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
@@ -20,8 +20,6 @@
 #ifndef _ACPI_S3_SAVE_PROTOCOL_H_

 #define _ACPI_S3_SAVE_PROTOCOL_H_

 

-#include <PiDxe.h>

-

 //

 // Forward reference for pure ANSI compatability

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
index 19d0e213f1..6573b5a9f8 100644
--- a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
@@ -26,8 +26,6 @@
 #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 ebe2e1ea21..a81a0ad26f 100644
--- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
+++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
@@ -19,7 +19,6 @@
 #ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H_

 #define _BOOT_SCRIPT_SAVE_PROTOCOL_H_

 

-#include <PiDxe.h>

 //

 // To get the multiple phase definitions defined in Boot Script Specification

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/CpuIo.h b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
index b09e338548..f1855e2aa1 100644
--- a/IntelFrameworkPkg/Include/Protocol/CpuIo.h
+++ b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
@@ -20,7 +20,6 @@
 #ifndef _CPUIO_H_

 #define _CPUIO_H_

 

-#include <PiDxe.h>

 

 #define EFI_CPU_IO_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/DataHub.h b/IntelFrameworkPkg/Include/Protocol/DataHub.h
index 2e9ef87099..a219e43125 100644
--- a/IntelFrameworkPkg/Include/Protocol/DataHub.h
+++ b/IntelFrameworkPkg/Include/Protocol/DataHub.h
@@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __DATA_HUB_H__

 #define __DATA_HUB_H__

 

-#include <PiDxe.h>

 

 #define EFI_DATA_HUB_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
index c2a7246ca2..981fb57704 100644
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -25,7 +25,6 @@
 #ifndef _FIRMWARE_VOLUME_H_

 #define _FIRMWARE_VOLUME_H_

 

-#include <PiDxe.h>

 

 //

 // Firmware Volume Protocol GUID definition

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
index 0d75e4b8f3..8ad5b1f1e2 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
@@ -18,7 +18,6 @@
 #ifndef __FRAMEWORK_FIRMWARE_VOLUME_BLOCK_H__

 #define __FRAMEWORK_FIRMWARE_VOLUME_BLOCK_H__

 

-#include <PiDxe.h>

 

 typedef struct _FRAMEWORK_EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL FRAMEWORK_EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;

 ///

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
index 575d0f6183..875f27c927 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -22,8 +22,6 @@
 #ifndef __FORM_CALLBACK_H__

 #define __FORM_CALLBACK_H__

 

-#include <FrameworkDxe.h>

-

 #include <Protocol/FrameworkHii.h>

 #include <Protocol/FrameworkFormBrowser.h>

 

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index f2f212be7d..2c7133257b 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -19,8 +19,7 @@
 #ifndef _FRAMEWORK_HII_H_

 #define _FRAMEWORK_HII_H_

 

-#include <PiDxe.h>

-

+#include <FrameworkDxe.h>

 //

 // To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL,

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

@@ -48,7 +47,6 @@
     0x5542cce1, 0xdf5c, 0x4d1b, { 0xab, 0xca, 0x36, 0x4f, 0x77, 0xd3, 0x99, 0xfb } \

   }

 

-typedef UINT16                    STRING_REF;

 typedef UINT32                    RELOFST;

 

 typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;

diff --git a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
index 7ea1f6bd00..e65264d8ca 100644
--- a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
@@ -29,7 +29,6 @@
 #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 bd3fa530c4..287d7a9ea8 100644
--- a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
@@ -33,7 +33,6 @@
 #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 2b5ccc9520..d2fbfa27d7 100644
--- a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
+++ b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
@@ -22,7 +22,6 @@
 #ifndef _EFI_LEGACY_8259_H_

 #define _EFI_LEGACY_8259_H_

 

-#include <PiDxe.h>

 

 #define EFI_LEGACY_8259_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
index e08dd3ff98..78e31bf6ca 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
@@ -32,7 +32,7 @@
 #ifndef _EFI_LEGACY_BIOS_H_

 #define _EFI_LEGACY_BIOS_H_

 

-#include <FrameworkDxe.h>

+#include <Framework/Legacy16.h>

 

 #define EFI_LEGACY_BIOS_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
index c2e2ba8316..83bc5172ed 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
@@ -24,7 +24,7 @@
 #ifndef _EFI_LEGACY_BIOS_PLATFORM_H_

 #define _EFI_LEGACY_BIOS_PLATFORM_H_

 

-#include <FrameworkDxe.h>

+#include <Framework/Legacy16.h>

 

 #define EFI_LEGACY_BIOS_PLATFORM_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
index a43b91a718..e684eb5aae 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
@@ -19,7 +19,6 @@
 #ifndef _EFI_LEGACY_INTERRUPT_H_

 #define _EFI_LEGACY_INTERRUPT_H_

 

-#include <PiDxe.h>

 

 #define EFI_LEGACY_INTERRUPT_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
index 0b3ab83b9d..1fe2cc754b 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_LEGACY_REGION_H_

 #define _EFI_LEGACY_REGION_H_

 

-#include <PiDxe.h>

 

 #define EFI_LEGACY_REGION_PROTOCOL_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
index db81fe5c41..43253da170 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
@@ -21,7 +21,6 @@
 #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 a1fa539996..684b6ca550 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
@@ -21,7 +21,6 @@
 #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 080952dc57..4c47ee6a52 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
@@ -22,7 +22,6 @@
 #ifndef _PCI_PLATFORM_H_

 #define _PCI_PLATFORM_H_

 

-#include <PiDxe.h>

 #include <Protocol/PciHostBridgeResourceAllocation.h>

 

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
index 7a8e755a5e..762c3a8547 100644
--- a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
@@ -25,9 +25,6 @@
 #ifndef _SECTION_EXTRACTION_PROTOCOL_H_

 #define _SECTION_EXTRACTION_PROTOCOL_H_

 

-#include <PiDxe.h>

-#include <Framework/FirmwareVolumeImageFormat.h>

-

 //

 // Protocol GUID definition

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
index 6b6db221d5..a55e1126ef 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
@@ -23,7 +23,6 @@
 #ifndef _SMM_ACCESS_H_

 #define _SMM_ACCESS_H_

 

-#include <PiDxe.h>

 #include <Guid/SmramMemoryReserve.h>

 

 typedef struct _EFI_SMM_ACCESS_PROTOCOL  EFI_SMM_ACCESS_PROTOCOL;

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmControl.h b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
index d33f3fbca1..5977b0e82f 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmControl.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
@@ -29,7 +29,6 @@
 #ifndef _SMM_CONTROL_H_

 #define _SMM_CONTROL_H_

 

-#include <PiDxe.h>

 

 typedef struct _EFI_SMM_CONTROL_PROTOCOL              EFI_SMM_CONTROL_PROTOCOL;

 

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
index 0632d25964..e0bfa142ea 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
@@ -20,7 +20,6 @@
 #ifndef _SMM_GPI_DISPATCH_H_

 #define _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 1719371314..2254cd42bf 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
@@ -23,7 +23,6 @@
 #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 8e3ed4fb29..663d0f8930 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
@@ -21,7 +21,6 @@
 #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 c17bb4442f..d5f4ab44af 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #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 ae2ed464eb..61bd0cf917 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
@@ -23,8 +23,6 @@
 #ifndef _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_

 #define _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_

 

-#include <FrameworkSmm.h>

-

 //

 // Global ID for the Standby Button SMI Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h b/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
index c2b9e70ddc..fdf33a428a 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
@@ -23,9 +23,6 @@
 #ifndef _EFI_SMM_ICHN_DISPATCH_H_

 #define _EFI_SMM_ICHN_DISPATCH_H_

 

-#include <PiDxe.h>

-#include <Pi/PiStatusCode.h>

-

 //

 // Global ID for the Smm Status code Protocol

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
index d3bd0017bf..53ce1e12f2 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
@@ -21,7 +21,6 @@
 #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 9f3e99002b..b29fbb3bfd 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
@@ -21,7 +21,6 @@
 #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 e4cf74219c..382461cb84 100644
--- a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
@@ -19,7 +19,6 @@
 #ifndef _EFI_SMM_USB_DISPATCH_H_

 #define _EFI_SMM_USB_DISPATCH_H_

 

-#include <PiDxe.h>

 

 //

 // Global ID for the USB Protocol