8 files changed, 3 insertions, 14 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