X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FInclude%2FEdkDxe.h;h=80a55a3e4d49815f49c8d71f6faeca6b61a586b4;hp=1b295d830b9235bedcac5b154f121bd0c7973a9b;hb=675a7b0b3fb896e5fcf4128b4fea52fc7d0811a1;hpb=e2c390b3a26557a9768442a818b5453cd5c2de8c

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 1b295d830b..80a55a3e4d 100644
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -26,14 +26,7 @@ Abstract:
 #ifndef __EDK_DXE_H__
 #define __EDK_DXE_H__
 
-//
 #include <Common/FlashMap.h>
-// BUGBUG: We must include this lib here due to ordering issues
-//
-#include <Ipf/SalApi.h>
-#include <Library/PeCoffLib.h>
-
-
 #include <Guid/MemoryTypeInformation.h>
 #include <Guid/FlashMapHob.h>
 #include <Guid/SystemNvDataGuid.h>
@@ -52,11 +45,14 @@ 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>
 #include <Guid/MemoryStatusCodeRecord.h>
+#include <Guid/GenericPlatformVariable.h>
 
 #include <Ppi/StatusCodeMemory.h>
 
@@ -81,8 +77,11 @@ 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>
+#include <Protocol/IsaIo.h>
 
 #if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))
 //