Remove the BugBug in package header file for DXE_CORE and DXE_DRIVER which force...

[mirror_edk2.git] / EdkModulePkg / Include / EdkDxe.h

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 83833e5918231d1d694e32ea73388e1cf05a6307..80a55a3e4d49815f49c8d71f6faeca6b61a586b4 100644 (file)
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -26,14 +26,7 @@ Abstract:
 #ifndef __EDK_DXE_H__\r
 #define __EDK_DXE_H__\r
 \r
-//\r
 #include <Common/FlashMap.h>\r
-// BUGBUG: We must include this lib here due to ordering issues\r
-//\r
-#include <Ipf/SalApi.h>\r
-#include <Library/PeCoffLib.h>\r
-\r
-\r
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Guid/SystemNvDataGuid.h>\r
@@ -52,10 +45,14 @@ Abstract:
 #include <Guid/StatusCode.h>\r
 #include <Guid/PciOptionRomTable.h>\r
 #include <Guid/PciHotplugDevice.h>\r
+#if defined(MDE_CPU_IPF)\r
 #include <Guid/ExtendedSalGuid.h>\r
+#endif\r
 #include <Guid/PeiPeCoffLoader.h>\r
 #include <Guid/CapsuleVendor.h>\r
 #include <Guid/CompatibleMemoryTested.h>\r
+#include <Guid/MemoryStatusCodeRecord.h>\r
+#include <Guid/GenericPlatformVariable.h>\r
 \r
 #include <Ppi/StatusCodeMemory.h>\r
 \r
@@ -67,7 +64,6 @@ Abstract:
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/DiskInfo.h>\r
 #include <Protocol/FvbExtension.h>\r
-#include <Protocol/SecurityPolicy.h>\r
 #include <Protocol/FaultTolerantWriteLite.h>\r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/OEMBadging.h>\r
@@ -81,12 +77,15 @@ Abstract:
 #include <Protocol/DebugAssert.h>\r
 #include <Protocol/usbatapi.h>\r
 #include <Protocol/PciHotPlugRequest.h>\r
+#if defined(MDE_CPU_IPF)\r
 #include <Protocol/ExtendedSalBootService.h>\r
+#endif\r
 #include <Protocol/IsaAcpi.h>\r
+#include <Protocol/IsaIo.h>\r
 \r
 #if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))\r
 //\r
-// Tiano8.5 Module use ScsiPassThru protocol together with the original ScsiIo protocol \r
+// Old EDK modules use Module use ScsiPassThru protocol together with the original ScsiIo protocol \r
 // In UEFI2.0, Module use ScsiPassThruExt Protocol with new UEFI2.0 ScsiIo protocol\r
 //\r
 #include <Protocol/ScsiIo.h>\r