11 files changed, 2 insertions, 20 deletions
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 \