diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index d2a7f66746..4c1c0b8630 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -223,9 +223,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>PeiPeCoffLoader</GuidCName>
     </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
+    <!--<GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>LoadPeImage</GuidCName>
-    </GuidCNames>
+    </GuidCNames>-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>EventExitBootServices</GuidCName>
     </GuidCNames>
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 72b9ab57ec..d1d91eb755 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -171,6 +171,7 @@
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
     <Entry Name="PcdDataBaseHob">
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 3f6b6c279e..b8d4c297fb 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -128,12 +128,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>FlashMapHob</GuidCName>
     </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
+    <!--<GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>Hob</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
+    </GuidCNames>-->
+    <!--<GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>SystemNvData</GuidCName>
-    </GuidCNames>
+    </GuidCNames>-->
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>AlternateFvBlock</GuidCName>
     </GuidCNames>