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

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 83833e5918..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,10 +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>
 
@@ -67,7 +64,6 @@ Abstract:
 #include <Protocol/GenericMemoryTest.h>
 #include <Protocol/DiskInfo.h>
 #include <Protocol/FvbExtension.h>
-#include <Protocol/SecurityPolicy.h>
 #include <Protocol/FaultTolerantWriteLite.h>
 #include <Protocol/ConsoleControl.h>
 #include <Protocol/OEMBadging.h>
@@ -81,12 +77,15 @@ 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))
 //
-// Tiano8.5 Module use ScsiPassThru protocol together with the original ScsiIo protocol 
+// Old EDK modules use Module use ScsiPassThru protocol together with the original ScsiIo protocol 
 // In UEFI2.0, Module use ScsiPassThruExt Protocol with new UEFI2.0 ScsiIo protocol
 //
 #include <Protocol/ScsiIo.h>