diff --git a/IntelFrameworkPkg/Include/FrameworkBase.h b/IntelFrameworkPkg/Include/FrameworkBase.h
index fb99890349..cf3fb25c56 100644
--- a/IntelFrameworkPkg/Include/FrameworkBase.h
+++ b/IntelFrameworkPkg/Include/FrameworkBase.h
@@ -21,9 +21,4 @@
 #ifndef _FRAMEWORK_BASE_H_
 #define _FRAMEWORK_BASE_H_
 
-#include <Common/FrameworkFirmwareFileSystem.h>
-#include <Common/FrameworkHob.h>
-#include <Common/FrameworkLegacy16.h>
-#include <Common/DataHubRecords.h>
-
 #endif
diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h
index 6fb767eb0c..9a1206fdec 100644
--- a/IntelFrameworkPkg/Include/FrameworkDxe.h
+++ b/IntelFrameworkPkg/Include/FrameworkDxe.h
@@ -21,7 +21,15 @@
 #define _FRAMEWORK_DXE_H_
 
 #include <FrameworkBase.h>
+
 #include <Common/FrameworkDxeCis.h>
+
+#include <Common/FrameworkFirmwareFileSystem.h>
+#include <Common/FrameworkHob.h>
+#include <Common/FrameworkLegacy16.h>
+#include <Common/DataHubRecords.h>
+
 #include <Common/FrameworkStatusCode.h>
+#include <Common/FrameworkStatusCodeDataTypeId.h>
 
 #endif
diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index fdcbbcf42b..8f36e9ee5e 100644
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,6 +22,13 @@
 
 #include <FrameworkBase.h>
 #include <PiPei.h>
+
+#include <Common/FrameworkFirmwareFileSystem.h>
+#include <Common/FrameworkHob.h>
+#include <Common/FrameworkLegacy16.h>
+#include <Common/DataHubRecords.h>
+
 #include <Common/FrameworkStatusCode.h>
+#include <Common/FrameworkStatusCodeDataTypeId.h>
 
 #endif
diff --git a/IntelFrameworkPkg/Include/FrameworkSmm.h b/IntelFrameworkPkg/Include/FrameworkSmm.h
index 0226b9a15b..0f530b091d 100644
--- a/IntelFrameworkPkg/Include/FrameworkSmm.h
+++ b/IntelFrameworkPkg/Include/FrameworkSmm.h
@@ -20,6 +20,8 @@
 #ifndef _FRAMEWORK_SMM_H_
 #define _FRAMEWORK_SMM_H_
 
+#include <FrameworkBase.h>
+
 #include <FrameworkDxe.h>
 #include <Common/FrameworkSmmCis.h>