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

diff --git a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
index b1157bafd375f416b5e6979572ca46a6b5aecadb..e613fa143a2f73c44f024e6f287fad462ec86e81 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
@@ -24,9 +24,7 @@
 #ifndef _DATAHUB_RECORDS_H_\r
 #define _DATAHUB_RECORDS_H_\r
 \r
-#include <PiPei.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/FrameworkHii.h>\r
+#include <Framework/FrameworkInternalFormRepresentation.h>\r
 \r
 #define EFI_PROCESSOR_SUBCLASS_VERSION    0x0100\r
 \r

diff --git a/IntelFrameworkPkg/Include/Framework/DxeCis.h b/IntelFrameworkPkg/Include/Framework/DxeCis.h
index efc7ae807fd1e974aecf20f5921b0dee4e5cd201..f0f8f7e295fb083507ce7820e79167abaa6ae016 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/DxeCis.h
+++ b/IntelFrameworkPkg/Include/Framework/DxeCis.h
@@ -16,8 +16,6 @@
 #ifndef _DXE_CIS_H_\r
 #define _DXE_CIS_H_\r
 \r
-#include <PiDxe.h>\r
-#include <Framework/StatusCode.h>\r
 #include <Protocol/StatusCode.h>\r
 \r
 //\r

diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
index 4daf27ca566a241db5f1117f56733323c057ea46..f261fa347e8b0e3572f187e1095ddee8a7d8b2e6 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
+++ b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
@@ -20,6 +20,8 @@
 #ifndef __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__\r
 #define __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__\r
 \r
+typedef UINT16  STRING_REF;\r
+\r
 //\r
 // IFR Op codes\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Framework/Hob.h b/IntelFrameworkPkg/Include/Framework/Hob.h
index c8e9914a7eb5f2b8e9b3d245f5ae5a2dc0b946be..f76cff11484d491a8da2d457c1a55c9715a52764 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/Hob.h
+++ b/IntelFrameworkPkg/Include/Framework/Hob.h
@@ -20,8 +20,6 @@
 #ifndef _FRAMEWORK_HOB_H_\r
 #define _FRAMEWORK_HOB_H_\r
 \r
-#include <PiPei.h>\r
-\r
 ///\r
 /// Capsule volume HOB -- identical to a firmware volume\r
 /// This macro is defined  to comply with hob Framework Spec. And the marco has been\r

diff --git a/IntelFrameworkPkg/Include/Framework/Legacy16.h b/IntelFrameworkPkg/Include/Framework/Legacy16.h
index 533782c7fd1455cbe5e0a3ada62b5559fc1d2c38..630880016b6b500d9b49b29f3df13d6b651f1e5e 100644 (file)
--- 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 5dc2f9c529abc7db54da7c7df27d1675f2e64d56..db0b185a1faabaa989dc97d7218108894243b165 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/PeiCis.h
+++ b/IntelFrameworkPkg/Include/Framework/PeiCis.h
@@ -16,7 +16,6 @@
 #ifndef __PEICIS_H__\r
 #define __PEICIS_H__\r
 \r
-#include <PiPei.h>\r
 #include <Ppi/PciCfg.h>\r
 //\r
 // Framework PEI Specification Revision information\r

diff --git a/IntelFrameworkPkg/Include/Framework/SmmCis.h b/IntelFrameworkPkg/Include/Framework/SmmCis.h
index 59a660c3a9001d58f825e7190d078b27a3e088cf..11d6a6b07ef36384d96c86ac183858ed0446af43 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/SmmCis.h
+++ b/IntelFrameworkPkg/Include/Framework/SmmCis.h
@@ -16,8 +16,6 @@
 #ifndef _FRAMEWORK_SMM_CIS_H_\r
 #define _FRAMEWORK_SMM_CIS_H_\r
 \r
-#include <Framework/DxeCis.h>\r
-\r
 #define EFI_SMM_CPU_IO_GUID \\r
   { \\r
     0x5f439a0b, 0x45d8, 0x4682, {0xa4, 0xf4, 0xf0, 0x57, 0x6b, 0x51, 0x34, 0x41 } \\r

diff --git a/IntelFrameworkPkg/Include/Framework/StatusCode.h b/IntelFrameworkPkg/Include/Framework/StatusCode.h
index b3a1cf48f87dd5f1a177176c4360d6246e379e43..5c15c5b795d0104ed0c3c6ded2de4ad724b85556 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/StatusCode.h
+++ b/IntelFrameworkPkg/Include/Framework/StatusCode.h
@@ -34,8 +34,6 @@
 #ifndef _FRAMEWORK_STATUS_CODE_H_\r
 #define _FRAMEWORK_STATUS_CODE_H_\r
 \r
-#include <PiPei.h>\r
-\r
 //\r
 // Section 1\r
 // Class definitions\r

diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h
index 098adae1e08514199d410c790b6f83fddaf830ad..a88bd0cf5bc4a025a63e936e0343cad3edb99de8 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkDxe.h
+++ b/IntelFrameworkPkg/Include/FrameworkDxe.h
@@ -19,10 +19,15 @@
 #ifndef _FRAMEWORK_DXE_H_\r
 #define _FRAMEWORK_DXE_H_\r
 \r
-#include <FrameworkPei.h>\r
-\r
-#include <Framework/DxeCis.h>\r
+#include <PiDxe.h>\r
 \r
 #include <Framework/FrameworkInternalFormRepresentation.h>\r
+#include <Framework/DataHubRecords.h>\r
+#include <Framework/FirmwareVolumeImageFormat.h>\r
+#include <Framework/FirmwareVolumeHeader.h>\r
+#include <Framework/Hob.h>\r
+#include <Framework/Legacy16.h>\r
+#include <Framework/StatusCode.h>\r
+#include <Framework/DxeCis.h>\r
 \r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index b5e5770b414b453e04d4de8511b1ece9c237907c..9455fd8e40b1b40ecbfcb8aad8448d76dce6a020 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,12 +22,10 @@
 \r
 #include <PiPei.h>\r
 \r
-#include <Framework/PeiCis.h>\r
-#include <Framework/DataHubRecords.h>\r
 #include <Framework/FirmwareVolumeImageFormat.h>\r
 #include <Framework/FirmwareVolumeHeader.h>\r
 #include <Framework/Hob.h>\r
-#include <Framework/Legacy16.h>\r
 #include <Framework/StatusCode.h>\r
+#include <Framework/PeiCis.h>\r
 \r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/Guid/Capsule.h b/IntelFrameworkPkg/Include/Guid/Capsule.h
index 90c82cb20eba3417cbdff1170af8594c73d9a182..53fb956fe633f56b6150a7f6d1755323d15f422f 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/Capsule.h
+++ b/IntelFrameworkPkg/Include/Guid/Capsule.h
@@ -17,8 +17,6 @@
 #ifndef _CAPSULE_GUID_H__\r
 #define _CAPSULE_GUID_H__\r
 \r
-#include <PiPei.h>\r
-\r
 //\r
 // This is the GUID of the capsule header of the image on disk.\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
index 2c49758865b2848fd85a56997b5a445665ddb003..fd7cc051d2393a51b4fa15a3b39a75d2052fd69f 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
@@ -17,7 +17,7 @@
 #ifndef _DATAHUB_RECORDS_GUID_H_\r
 #define _DATAHUB_RECORDS_GUID_H_\r
 \r
-#include <PiPei.h>\r
+#include <Framework/DataHubRecords.h>\r
 \r
 #define EFI_PROCESSOR_SUBCLASS_GUID \\r
   { 0x26fdeb7e, 0xb8af, 0x4ccf, {0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 } }\r

diff --git a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
index a27a8a2a85d06baa036c46e8bb28558b6330d9e8..7bcd7930bef7118df3e7ff6e74ce9064b6fef4a8 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
+++ b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
@@ -21,8 +21,6 @@
 #ifndef __FIRMWARE_FILE_SYSTEM_GUID_H__\r
 #define __FIRMWARE_FILE_SYSTEM_GUID_H__\r
 \r
-#include <PiPei.h>\r
-\r
 ///\r
 /// GUIDs defined by the FFS specification.\r
 ///\r

diff --git a/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h b/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h
index e03d5993ef45a06247bc7f69d74b30a84d3ca56f..44046ed8eee7d1da024b255f4cbcdfbde4b85ed1 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h
+++ b/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h
@@ -21,8 +21,6 @@
 #ifndef _SMM_COMMUNICATE_GUID_H_\r
 #define _SMM_COMMUNICATE_GUID_H_\r
 \r
-#include <PiPei.h>\r
-\r
 ///\r
 /// Inconsistent with specification here: \r
 /// GUID definition format has been changed, because the GUID format in Framework spec is incorrect.\r

diff --git a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
index 0fb4ba12e276de07e65a3ca9fa459eed5bfe817b..8dece94a94391497bc5ac7c1b42d97ce2f5d3a36 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
+++ b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
@@ -25,8 +25,6 @@
 #ifndef _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_\r
 #define _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_SMM_PEI_SMRAM_MEMORY_RESERVE \\r
   { \\r
     0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } \\r

diff --git a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
index f0193711f8b0b5e349dec5f756087ac46b5dfc21..991cd2d1db12db6b81f60dd1af9e681d68d6ba8a 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
@@ -20,9 +20,7 @@
 #ifndef __STATUS_CODE_DATA_TYPE_ID_GUID_H__\r
 #define __STATUS_CODE_DATA_TYPE_ID_GUID_H__\r
 \r
-#include <PiPei.h>\r
 #include <Framework/StatusCode.h>\r
-#include <Framework/DataHubRecords.h>\r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/FrameworkHii.h>\r
 \r

diff --git a/IntelFrameworkPkg/Include/Ppi/BlockIo.h b/IntelFrameworkPkg/Include/Ppi/BlockIo.h
index 0134776cede3208bf222e500bdd6412078a54968..3b02f4016f16bdba3bbde2b2310c0602feb34d79 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/BlockIo.h
+++ b/IntelFrameworkPkg/Include/Ppi/BlockIo.h
@@ -21,8 +21,6 @@
 #ifndef _PEI_BLOCK_IO_H_\r
 #define _PEI_BLOCK_IO_H_\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_PEI_IDE_BLOCK_IO_PPI \\r
   { \\r
     0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }  \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h
index bb1058ed78109962097ee2bbac6dcd221edd844a..f66b913e682b6879bad1feed5f9d7b8240694f94 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h
+++ b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h
@@ -28,7 +28,7 @@
 #ifndef _PEI_BOOT_SCRIPT_EXECUTER_PPI_H_\r
 #define _PEI_BOOT_SCRIPT_EXECUTER_PPI_H_\r
 \r
-#include <PiPei.h>\r
+#include <FrameworkPei.h>\r
 \r
 #define EFI_ACPI_S3_RESUME_SCRIPT_TABLE               0x00\r
 \r

diff --git a/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h b/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h
index 1113aa48c242850c9e322530b454c5b1e73b0382..7847b51079420afd08c31d5dec533e65e3532297 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h
+++ b/IntelFrameworkPkg/Include/Ppi/DeviceRecoveryModule.h
@@ -26,8 +26,6 @@
 #ifndef _PEI_DEVICE_RECOVERY_MODULE_PPI_H_\r
 #define _PEI_DEVICE_RECOVERY_MODULE_PPI_H_\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_PEI_DEVICE_RECOVERY_MODULE_PPI_GUID \\r
   { \\r
     0x0DE2CE25, 0x446A, 0x45a7, {0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37 } \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/FindFv.h b/IntelFrameworkPkg/Include/Ppi/FindFv.h
index f36580ed00440e5deea26ef0e121024909aa7cdb..0ddeb4d0f27b5f16b429966d5e417708d26d8069 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/FindFv.h
+++ b/IntelFrameworkPkg/Include/Ppi/FindFv.h
@@ -21,8 +21,6 @@
 #ifndef _FIND_FV_H_\r
 #define _FIND_FV_H_\r
 \r
-#include <PiPei.h>\r
-\r
 ///\r
 ///  Inconsistent with specification here: \r
 ///  GUID value format has been changed to the standard guid format.\r

diff --git a/IntelFrameworkPkg/Include/Ppi/PciCfg.h b/IntelFrameworkPkg/Include/Ppi/PciCfg.h
index 3f4398a3c6e61301a0ef6f335aff621eaa67363e..6b9f98990ed7248fce542a078de17f0576fffee5 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/PciCfg.h
+++ b/IntelFrameworkPkg/Include/Ppi/PciCfg.h
@@ -21,11 +21,10 @@
 #ifndef __PEI_PCI_CFG_H__\r
 #define __PEI_PCI_CFG_H__\r
 \r
-#include <Pi/PiPeiCis.h>\r
+#include <Ppi/PciCfg2.h>\r
 //\r
 // Get the common definitions for EFI_PEI_PCI_CFG_PPI_WIDTH.\r
 //\r
-#include <Ppi/PciCfg2.h>\r
 \r
 #define EFI_PEI_PCI_CFG_PPI_INSTALLED_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h b/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h
index 2a1b76ab264d3ae7ea77c619b7028548ece44d91..30015604af78028631e921105b15391a641b0084 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h
+++ b/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h
@@ -21,8 +21,6 @@
 #ifndef __PEI_READ_ONLY_VARIABLE_PPI_H__\r
 #define __PEI_READ_ONLY_VARIABLE_PPI_H__\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_PEI_READ_ONLY_VARIABLE_ACCESS_PPI_GUID \\r
   { \\r
     0x3cdc90c6, 0x13fb, 0x4a75, {0x9e, 0x79, 0x59, 0xe9, 0xdd, 0x78, 0xb9, 0xfa } \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h b/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h
index 7c993d494dba04f278e93e506e82122f125d2fda..e381647facd6ff75e150e52091366f010a429e80 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h
+++ b/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h
@@ -22,8 +22,6 @@
 #ifndef __PEI_RECOVERY_MODULE_PPI_H__\r
 #define __PEI_RECOVERY_MODULE_PPI_H__\r
 \r
-#include <PiPei.h>\r
-\r
 ///\r
 ///  Inconsistent with specification here: \r
 ///  GUID marco name has been changed to the consistent PPI GUID macro name.\r

diff --git a/IntelFrameworkPkg/Include/Ppi/S3Resume.h b/IntelFrameworkPkg/Include/Ppi/S3Resume.h
index 2509eb53b62482f7e9dc36d05305ad16ab5bcb61..9259a16b6a4572565411f2c8881c137cbc9a52ec 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/S3Resume.h
+++ b/IntelFrameworkPkg/Include/Ppi/S3Resume.h
@@ -37,8 +37,6 @@
 #ifndef __PEI_S3_RESUME_PPI_H__\r
 #define __PEI_S3_RESUME_PPI_H__\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_PEI_S3_RESUME_PPI_GUID \\r
   { \\r
     0x4426CCB2, 0xE684, 0x4a8a, {0xAE, 0x40, 0x20, 0xD4, 0xB0, 0x25, 0xB7, 0x10 } \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h b/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h
index e5daf149c10cde7eec6ec3e1bd1e6a9ed3dfff1c..4489c18ba2a64eb89447daad693689650675579f 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h
@@ -18,8 +18,6 @@
 #ifndef __SECTION_EXTRACTION_H__\r
 #define __SECTION_EXTRACTION_H__\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_PEI_SECTION_EXTRACTION_PPI_GUID \\r
   { \\r
     0x4F89E208, 0xE144, 0x4804, {0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 } \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/Security.h b/IntelFrameworkPkg/Include/Ppi/Security.h
index 48a99a84cc7e8244bfa332b55d435794f8c4bdb7..60c15e6cfa78b1ef12a2d00e118361e5ad3c1144 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/Security.h
+++ b/IntelFrameworkPkg/Include/Ppi/Security.h
@@ -25,8 +25,6 @@
 #ifndef __SECURITY_PPI_H__\r
 #define __SECURITY_PPI_H__\r
 \r
-#include <PiPei.h>\r
-\r
 #define EFI_PEI_SECURITY_PPI_GUID \\r
   { \\r
     0x1388066e, 0x3a57, 0x4efa, {0x98, 0xf3, 0xc1, 0x2f, 0x3a, 0x95, 0x8a, 0x29 } \\r

diff --git a/IntelFrameworkPkg/Include/Ppi/Smbus.h b/IntelFrameworkPkg/Include/Ppi/Smbus.h
index 5b7c6274ed79d5762b5d670a351c9f042e43f21f..3833937adbcf2c36ddf8b75d5efb599400a6b12e 100644 (file)
--- a/IntelFrameworkPkg/Include/Ppi/Smbus.h
+++ b/IntelFrameworkPkg/Include/Ppi/Smbus.h
@@ -20,7 +20,6 @@
 #ifndef _PEI_SMBUS_PPI_H_\r
 #define _PEI_SMBUS_PPI_H_\r
 \r
-#include <PiPei.h>\r
 #include <Ppi/Smbus2.h>\r
 \r
 #define EFI_PEI_SMBUS_PPI_GUID \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
index 6c804693560efef68bab67f4bf1af2cd9bb01fbf..0e095f8148149e267150e54854e695f45331f93e 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
@@ -20,8 +20,6 @@
 #ifndef _ACPI_S3_SAVE_PROTOCOL_H_\r
 #define _ACPI_S3_SAVE_PROTOCOL_H_\r
 \r
-#include <PiDxe.h>\r
-\r
 //\r
 // Forward reference for pure ANSI compatability\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
index 19d0e213f1048d74eac8967630e5d333dd315401..6573b5a9f8c1f969addfb4f6aeddf2e5d133f4d4 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
@@ -26,8 +26,6 @@
 #ifndef _ACPI_SUPPORT_PROTOCOL_H_\r
 #define _ACPI_SUPPORT_PROTOCOL_H_\r
 \r
-#include <PiDxe.h>\r
-\r
 typedef struct _EFI_ACPI_SUPPORT_PROTOCOL EFI_ACPI_SUPPORT_PROTOCOL;\r
 \r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
index ebe2e1ea213c68f15109ff31373fda671e08da4f..a81a0ad26fc5a53b9e2419fea18deb5361b49f2d 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
+++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
@@ -19,7 +19,6 @@
 #ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H_\r
 #define _BOOT_SCRIPT_SAVE_PROTOCOL_H_\r
 \r
-#include <PiDxe.h>\r
 //\r
 // To get the multiple phase definitions defined in Boot Script Specification\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/CpuIo.h b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
index b09e338548905f8047ab22060171165512b02f64..f1855e2aa100e0c805d438c503197ebc00cad99e 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/CpuIo.h
+++ b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
@@ -20,7 +20,6 @@
 #ifndef _CPUIO_H_\r
 #define _CPUIO_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 #define EFI_CPU_IO_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/DataHub.h b/IntelFrameworkPkg/Include/Protocol/DataHub.h
index 2e9ef87099a2a5984a06009f39cff1f6603ef45a..a219e431250f523093f4ba2d355cec0d8db545d7 100644 (file)
--- 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__\r
 #define __DATA_HUB_H__\r
 \r
-#include <PiDxe.h>\r
 \r
 #define EFI_DATA_HUB_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
index c2a7246ca28df7fb2098703ba280b406ebaf98e9..981fb57704ce68a0efe74aba159abe3b27a0557b 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -25,7 +25,6 @@
 #ifndef _FIRMWARE_VOLUME_H_\r
 #define _FIRMWARE_VOLUME_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Firmware Volume Protocol GUID definition\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
index 0d75e4b8f31a7f02256e7e11e188013b1ae2da63..8ad5b1f1e229f5d495c8bfe79b48d24da8ff0d88 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
@@ -18,7 +18,6 @@
 #ifndef __FRAMEWORK_FIRMWARE_VOLUME_BLOCK_H__\r
 #define __FRAMEWORK_FIRMWARE_VOLUME_BLOCK_H__\r
 \r
-#include <PiDxe.h>\r
 \r
 typedef struct _FRAMEWORK_EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL FRAMEWORK_EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;\r
 ///\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
index 575d0f61832e640090e44ccbdf5c046b5ba411f7..875f27c927d2a148409e8fdec8713a33275b00bf 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -22,8 +22,6 @@
 #ifndef __FORM_CALLBACK_H__\r
 #define __FORM_CALLBACK_H__\r
 \r
-#include <FrameworkDxe.h>\r
-\r
 #include <Protocol/FrameworkHii.h>\r
 #include <Protocol/FrameworkFormBrowser.h>\r
 \r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index f2f212be7d9020ac06c445f892d3fb19e95556bb..2c7133257b1e6fcd1d1fe2c88cdc7124d5d44891 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -19,8 +19,7 @@
 #ifndef _FRAMEWORK_HII_H_\r
 #define _FRAMEWORK_HII_H_\r
 \r
-#include <PiDxe.h>\r
-\r
+#include <FrameworkDxe.h>\r
 //\r
 // To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL,\r
 // is defined in MdePkg/Protocol/GraphicsOutput.h\r
@@ -48,7 +47,6 @@
     0x5542cce1, 0xdf5c, 0x4d1b, { 0xab, 0xca, 0x36, 0x4f, 0x77, 0xd3, 0x99, 0xfb } \\r
   }\r
 \r
-typedef UINT16                    STRING_REF;\r
 typedef UINT32                    RELOFST;\r
 \r
 typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;\r

diff --git a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
index 7ea1f6bd0099d92d516ea239986eabf46ecdada8..e65264d8ca10016dfb9c7f9b31d76dbe0c22828a 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
@@ -29,7 +29,6 @@
 #ifndef _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_\r
 #define _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 ///\r
 /// Global ID for the EFI Platform IDE Protocol GUID\r

diff --git a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
index bd3fa530c431eec155896c7969cadbd9800d063f..287d7a9ea8adf8cd429923c18d188e2ae25f4c5d 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
@@ -33,7 +33,6 @@
 #ifndef _INCOMPATIBLE_PCI_DEVICE_SUPPORT_H_\r
 #define _INCOMPATIBLE_PCI_DEVICE_SUPPORT_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 #define EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL_GUID \\r
         {0xeb23f55a, 0x7863, 0x4ac2, {0x8d, 0x3d, 0x95, 0x65, 0x35, 0xde, 0x03, 0x75} }\r

diff --git a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
index 2b5ccc95206aff90230ea6b0337ac8efc79afe82..d2fbfa27d764a786d6f66efea024ecd5e62b9ac8 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
+++ b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
@@ -22,7 +22,6 @@
 #ifndef _EFI_LEGACY_8259_H_\r
 #define _EFI_LEGACY_8259_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 #define EFI_LEGACY_8259_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
index e08dd3ff98d37cd8ef1fe7f455dc664a7519b6c2..78e31bf6ca73b01c94fb6113e2628ae0867c07f9 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
@@ -32,7 +32,7 @@
 #ifndef _EFI_LEGACY_BIOS_H_\r
 #define _EFI_LEGACY_BIOS_H_\r
 \r
-#include <FrameworkDxe.h>\r
+#include <Framework/Legacy16.h>\r
 \r
 #define EFI_LEGACY_BIOS_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
index c2e2ba83169d38bbe09ee44ea47ff83370c6d1ce..83bc5172ed03e3d2677d07539034cfd677546609 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
@@ -24,7 +24,7 @@
 #ifndef _EFI_LEGACY_BIOS_PLATFORM_H_\r
 #define _EFI_LEGACY_BIOS_PLATFORM_H_\r
 \r
-#include <FrameworkDxe.h>\r
+#include <Framework/Legacy16.h>\r
 \r
 #define EFI_LEGACY_BIOS_PLATFORM_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
index a43b91a718ceaa0bf12c2f379a59da9e9f64ced1..e684eb5aaeb1213f618423f6f3545a5fbbdc71ea 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
@@ -19,7 +19,6 @@
 #ifndef _EFI_LEGACY_INTERRUPT_H_\r
 #define _EFI_LEGACY_INTERRUPT_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 #define EFI_LEGACY_INTERRUPT_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
index 0b3ab83b9d5c4dc7ca3cda2c46bedbbcb4ededbe..1fe2cc754baffa3f008c0bdc4358427bb2609f77 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_LEGACY_REGION_H_\r
 #define _EFI_LEGACY_REGION_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 #define EFI_LEGACY_REGION_PROTOCOL_GUID \\r
   { \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
index db81fe5c415342953dcbd56b190d7f36169ea032..43253da1704fbbca0bf54c428361a68dbbb0a644 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
@@ -21,7 +21,6 @@
 #ifndef _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_\r
 #define _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_\r
 \r
-#include <PiDxe.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 \r
 #define EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GUID \\r

diff --git a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
index a1fa53999689c7caffd38ebd42000f6739d94579..684b6ca550f2313ae93af3107528d5df707261fc 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_PCI_HOT_PLUG_INIT_H_\r
 #define _EFI_PCI_HOT_PLUG_INIT_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 ///\r
 /// Global ID for the PCI Hot Plug Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
index 080952dc5711edaa538598e18ae491af3d1520be..4c47ee6a52b727139d3ccb9163b242d7ed635597 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
@@ -22,7 +22,6 @@
 #ifndef _PCI_PLATFORM_H_\r
 #define _PCI_PLATFORM_H_\r
 \r
-#include <PiDxe.h>\r
 #include <Protocol/PciHostBridgeResourceAllocation.h>\r
 \r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
index 7a8e755a5ec64391b44cc2edf2e6209a0f8f1714..762c3a8547ca29543fccb6068d6cfccce3cf8ff7 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
@@ -25,9 +25,6 @@
 #ifndef _SECTION_EXTRACTION_PROTOCOL_H_\r
 #define _SECTION_EXTRACTION_PROTOCOL_H_\r
 \r
-#include <PiDxe.h>\r
-#include <Framework/FirmwareVolumeImageFormat.h>\r
-\r
 //\r
 // Protocol GUID definition\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
index 6b6db221d50ad5ff59bd2904f7b83da88be22a3c..a55e1126ef0c1034f62e0522f733d72451f90313 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
@@ -23,7 +23,6 @@
 #ifndef _SMM_ACCESS_H_\r
 #define _SMM_ACCESS_H_\r
 \r
-#include <PiDxe.h>\r
 #include <Guid/SmramMemoryReserve.h>\r
 \r
 typedef struct _EFI_SMM_ACCESS_PROTOCOL  EFI_SMM_ACCESS_PROTOCOL;\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmControl.h b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
index d33f3fbca1b3c6d82937b62d1af6c74e85aa53ea..5977b0e82f57ad02149cb5d494ad227afbb9ed30 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmControl.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
@@ -29,7 +29,6 @@
 #ifndef _SMM_CONTROL_H_\r
 #define _SMM_CONTROL_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 typedef struct _EFI_SMM_CONTROL_PROTOCOL              EFI_SMM_CONTROL_PROTOCOL;\r
 \r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
index 0632d259643c1ef8c9f933407fedaf6561abeac3..e0bfa142eac622ec39fd5d27914e58116b2168e9 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
@@ -20,7 +20,6 @@
 #ifndef _SMM_GPI_DISPATCH_H_\r
 #define _SMM_GPI_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the GPI SMI Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
index 1719371314df3c92669ef2a877fdc6dfad646cd1..2254cd42bf9c02719760201d84efa1c200eb914b 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
@@ -23,7 +23,6 @@
 #ifndef _EFI_SMM_ICHN_DISPATCH_H_\r
 #define _EFI_SMM_ICHN_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the ICH SMI Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
index 8e3ed4fb29936960ec7f26a1935406066678524b..663d0f8930c320be8115ff84afcffa2fa75c5c66 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_SMM_PERIODIC_TIMER_DISPATCH_H_\r
 #define _EFI_SMM_PERIODIC_TIMER_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the Periodic Timer SMI Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
index c17bb4442f13c7e0f2d851a7082a6f939be2c355..d5f4ab44af016240ffc7eebde1f864bd8b598d86 100644 (file)
--- 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_\r
 #define _EFI_SMM_POWER_BUTTON_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the Power Button SMI Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
index ae2ed464eb2fdbbad72a4354d19a41c35f544aca..61bd0cf91794884b2759d414befecdd68dd6e78f 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
@@ -23,8 +23,6 @@
 #ifndef _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_\r
 #define _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_\r
 \r
-#include <FrameworkSmm.h>\r
-\r
 //\r
 // Global ID for the Standby Button SMI Protocol\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h b/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
index c2b9e70ddc834f8d4bcc90683047dd01565d6a13..fdf33a428a46e4aeb81a5d95e5674a5cbfeebe48 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
@@ -23,9 +23,6 @@
 #ifndef _EFI_SMM_ICHN_DISPATCH_H_\r
 #define _EFI_SMM_ICHN_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
-#include <Pi/PiStatusCode.h>\r
-\r
 //\r
 // Global ID for the Smm Status code Protocol\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
index d3bd0017bfcb819d411faf8a1767462dcdb16e8d..53ce1e12f2ddb2658faea5cbfbf70d98abeb2a19 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_SMM_SW_DISPATCH_H_\r
 #define _EFI_SMM_SW_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the SW SMI Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
index 9f3e99002b5a89e94c4ba8bbd1013a61fbe6e900..b29fbb3bfd080860b0aac6390379153009f4aaf8 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_SMM_SX_DISPATCH_H_\r
 #define _EFI_SMM_SX_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the Sx SMI Protocol\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
index e4cf74219cb9693865421b12c72c2e6767db81ce..382461cb8484ed362e4a6076da1dbee987e33737 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
@@ -19,7 +19,6 @@
 #ifndef _EFI_SMM_USB_DISPATCH_H_\r
 #define _EFI_SMM_USB_DISPATCH_H_\r
 \r
-#include <PiDxe.h>\r
 \r
 //\r
 // Global ID for the USB Protocol\r