diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index dc7185899b..8f7c8e993b 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -24,9 +24,9 @@ Revision History
 #ifndef _PEI_MAIN_H_
 #define _PEI_MAIN_H_
 
-#ifdef EFI64
-#include "SalApi.h"
-#endif
+//#ifdef EFI64
+//#include "SalApi.h"
+//#endif
 
 //
 //Build private HOB to PEI core to transfer old NEM-range data to new NEM-range
diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 1b295d830b..185d8424e1 100644
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -30,7 +30,7 @@ Abstract:
 #include <Common/FlashMap.h>
 // BUGBUG: We must include this lib here due to ordering issues
 //
-#include <Ipf/SalApi.h>
+//#include <Ipf/SalApi.h>
 #include <Library/PeCoffLib.h>
 
 
@@ -52,7 +52,9 @@ Abstract:
 #include <Guid/StatusCode.h>
 #include <Guid/PciOptionRomTable.h>
 #include <Guid/PciHotplugDevice.h>
+#if defined(MDE_CPU_IPF)
 #include <Guid/ExtendedSalGuid.h>
+#endif
 #include <Guid/PeiPeCoffLoader.h>
 #include <Guid/CapsuleVendor.h>
 #include <Guid/CompatibleMemoryTested.h>
@@ -81,7 +83,9 @@ Abstract:
 #include <Protocol/DebugAssert.h>
 #include <Protocol/usbatapi.h>
 #include <Protocol/PciHotPlugRequest.h>
+#if defined(MDE_CPU_IPF)
 #include <Protocol/ExtendedSalBootService.h>
+#endif
 #include <Protocol/IsaAcpi.h>
 
 #if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index 8a1f2901b4..1b424a11ad 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -49,7 +49,7 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
       <Keyword>EdkDxeSalLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index 32aa525bc8..48cbc6504f 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -40,7 +40,7 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
       <Keyword>EdkDxeSalLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
index 35598f2958..ba00daf0ff 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
@@ -15,7 +15,7 @@ Module Name:
 
 --*/
 
-#include <SalApi.h>
+//#include <SalApi.h>
 #include <RuntimeLibInternal.h>
 
 //
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
index 61f5ccff7f..df6496d0ad 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
@@ -40,7 +40,7 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
       <Keyword>EdkDxeSalLib</Keyword>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 619c0980df..44dfacc5da 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -40,7 +40,7 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
       <Keyword>EdkDxeSalLib</Keyword>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index f4fbd06588..5935bdd8f5 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
@@ -68,7 +68,7 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>OemHookStatusCodeLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
       <Keyword>EdkDxeSalLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>