63 files changed, 89 insertions, 128 deletions
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index ec2e913..9d61067 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_EHCI_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/Usb2HostController.h>
 #include <Protocol/PciIo.h>
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index 92c7833..7a8f880 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_UHCI_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/Usb2HostController.h>
 #include <Protocol/UsbHostController.h>
diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
index 43994c7..05f3844a 100644
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _UNDI_32_H_
 #define _UNDI_32_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Guid/EventGroup.h>
 #include <Protocol/PciIo.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
index ddf5a88..0e18db5 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Protocol/ScsiPassThru.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 16ad48a..d09d76a 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Protocol/ScsiPassThru.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 9928503..eb9c1d4 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Protocol/ScsiIo.h>
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 1bb7712..54dbada 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Protocol/ScsiIo.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
index 529c76c..f989340 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
index dc6d215..41f2022 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USB_BUS_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/Usb2HostController.h>
 #include <Protocol/UsbHostController.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
index b933201..780f16c 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USB_KB_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/SimpleTextIn.h>
 #include <Protocol/SimpleTextInEx.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
index 45827b8..a48f0be 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Library/UefiLib.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
index 019667c..b65fc18 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USBMASS_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/BlockIo.h>
 #include <Protocol/UsbIo.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 9c7d22f..2dd3cf2 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _USB_MOUSE_ABSOLUTE_POINTER_H
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/AbsolutePointer.h>
 #include <Protocol/UsbIo.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 0e4c566..959b914 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USB_MOUSE_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/SimplePointer.h>
 #include <Protocol/UsbIo.h>
diff --git a/MdeModulePkg/Core/RuntimeDxe/Crc32.c b/MdeModulePkg/Core/RuntimeDxe/Crc32.c
index 14370db..aef2d65 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Crc32.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Crc32.c
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 UINT32  mCrcTable[256];
 
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index c19cc73..f41b375 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _RUNTIME_H_
 #define _RUNTIME_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/Runtime.h>
 #include <Library/BaseLib.h>
diff --git a/MdeModulePkg/Include/MdeModuleHii.h b/MdeModulePkg/Include/MdeModuleHii.h
index 28f2ea3..a463c19 100644
--- a/MdeModulePkg/Include/MdeModuleHii.h
+++ b/MdeModulePkg/Include/MdeModuleHii.h
@@ -113,7 +113,7 @@ typedef struct _EFI_IFR_GUID_SUBCLASS {
 } EFI_IFR_GUID_SUBCLASS;
 
 //
-// GUIDed opcodes defined for Tiano
+// GUIDed opcodes defined for framework vfr.
 //
 #define EFI_IFR_FRAMEWORK_GUID \
   { 0x31ca5d1a, 0xd511, 0x4931, { 0xb7, 0x82, 0xae, 0x6b, 0x2b, 0x17, 0x8c, 0xd7 } }
diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
index 66546f1..1d45729 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
@@ -11,7 +11,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Library/CapsuleLib.h>
 
 /**
diff --git a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
index 78714e9..2281115 100644
--- a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
+++ b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/Print.h>
 
diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
index 8b7c61d..b29e13a 100644
--- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
+++ b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DevicePath.h>
 
diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
index bbc3a90..f402f5a 100644
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _IFRLIBRARY_INTERNAL_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Guid/GlobalVariable.h>
 #include <Protocol/DevicePath.h>
diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index 851f40e..997bd95 100644
--- a/MdeModulePkg/Library/GraphicsLib/Graphics.c
+++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/OEMBadging.h>
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 989f3a4..17aa473 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define  _CAPSULE_RUNTIME_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/Capsule.h>
 #include <Guid/CapsuleVendor.h>
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index eccb18b..529c03d 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _CON_PLATFORM_H_
 #define _CON_PLATFORM_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/DevicePath.h>
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index b1bb791..578b49a 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _CON_SPLITTER_H_
 #define _CON_SPLITTER_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Guid/PrimaryStandardErrorDevice.h>
 #include <Guid/PrimaryConsoleOutDevice.h>
 #include <Protocol/GraphicsOutput.h>
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 8f0bf69..9fa72ad 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _GRAPHICS_CONSOLE_H_
 #define _GRAPHICS_CONSOLE_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/GraphicsOutput.h>
 #include <Protocol/UgaDraw.h>
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index abe4324..7da100c 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _TERMINAL_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/SerialIo.h>
 #include <Guid/GlobalVariable.h>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
index 044572f..b8cd8ec 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PLDEBUG_SUPPORT_H
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DebugSupport.h>
 #include <Protocol/LoadedImage.h>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
index 8fdf147..b52597a 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PLDEBUG_SUPPORT_H
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DebugSupport.h>
 #include <Protocol/LoadedImage.h>
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
index ca92d07..f45ceff 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PLDEBUG_SUPPORT_H
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DebugSupport.h>
 #include <Protocol/LoadedImage.h>
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index 073f9b9..b1f398d 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _DEVICE_PATH_DRIVER_H_
 #define _DEVICE_PATH_DRIVER_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/DevicePathUtilities.h>
 #include <Protocol/DebugPort.h>
 #include <Protocol/DevicePathToText.h>
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 60fa280..20f9795 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -24,7 +24,7 @@ Revision History
 #ifndef _DRIVER_SAMPLE_H
 #define _DRIVER_SAMPLE_H
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/HiiConfigRouting.h>
 #include <Protocol/FormBrowser2.h>
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index becd701..5ad58c0 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EBC_INT_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DebugSupport.h>
 #include <Protocol/Ebc.h>
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index ad016c3..d559c82 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __HII_DATABASE_PRIVATE_H__
 #define __HII_DATABASE_PRIVATE_H__
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/ConsoleControl.h>
 #include <Protocol/DevicePath.h>
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index e5e785e..a71e6a2 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _NULL_MEMORY_TEST_H
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Protocol/GenericMemoryTest.h>
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
index 408b8c4..4fac2a0 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _MONOTONIC_COUNTER_DRIVER_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/MonotonicCounter.h>
 
diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
index 6cb9158..8d1dbe1 100644
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _RTC_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/RealTimeClock.h>
 #include <Guid/GenericPlatformVariable.h>
diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
index 2c19eff..d9f9dee 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
@@ -22,8 +22,6 @@ Abstract:
 #ifndef _PLAT_OVER_MNGR_H_
 #define _PLAT_OVER_MNGR_H_
 
-#include <Uefi.h>
-
 #include <PiDxe.h>
 
 #include <Protocol/HiiConfigAccess.h>
diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
index 5a5b276..a9d6270 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
@@ -21,7 +21,7 @@ Abstract:
 #ifndef PLATFORM_DRI_OVERRIDE_H_
 #define PLATFORM_DRI_OVERRIDE_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
index 5749571..66f0719 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
@@ -19,7 +19,7 @@
 //
 // Common header files for this module.
 //
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/Security.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index b1e3c84..60cd50f 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _SETUP_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/Print.h>
 #include <Protocol/SimpleTextOut.h>
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 88e9dd6..956e23d 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Statements that include other header files
 //
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/VariableWrite.h>
 #include <Protocol/Variable.h>
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 1fb430e..cf24144 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _VARIABLE_H
 #define _VARIABLE_H
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/VariableWrite.h>
 #include <Protocol/FaultTolerantWriteLite.h>
 #include <Protocol/FirmwareVolumeBlock.h>
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index 103ad06..3ceea7d 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/ReportStatusCodeLib.h>
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
index e8229f7..1c1c879 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
@@ -14,7 +14,7 @@
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 
 #include <Library/MemoryAllocationLib.h>
diff --git a/MdePkg/Library/HiiLib/InternalHiiLib.h b/MdePkg/Library/HiiLib/InternalHiiLib.h
index d80db67..0c7ed9d 100644
--- a/MdePkg/Library/HiiLib/InternalHiiLib.h
+++ b/MdePkg/Library/HiiLib/InternalHiiLib.h
@@ -15,7 +15,7 @@
 #ifndef __INTERNAL_HII_LIB_H__
 #define __INTERNAL_HII_LIB_H__
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/HiiDatabase.h>
 #include <Protocol/HiiString.h>
diff --git a/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h b/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h
index 1cdb36c..d5fcb66 100644
--- a/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h
+++ b/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _IFRLIBRARY_INTERNAL_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DevicePath.h>
 
diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
index 100549c..ee19701 100644
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
@@ -13,7 +13,7 @@
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
index 970df2b..886287f 100644
--- a/MdePkg/Library/UefiLib/UefiLibInternal.h
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -14,7 +14,7 @@
 #define __UEFI_LIB_INTERNAL_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Protocol/DriverBinding.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/ComponentName2.h>
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
index 4565955..a30a95c 100644
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -1,7 +1,7 @@
 /** @file
-  Library utility functions for Runtime driver.
+  UEFI Runtime Library implementation for non IPF processor types.
 
-Copyright (c) 2006 Intel Corporation. <BR>
+Copyright (c) 2006 - 2008 Intel Corporation. <BR>
 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
@@ -70,6 +70,8 @@ RuntimeLibVirtualNotifyEvent (
 
 /**
   Intialize runtime Driver Lib if it has not yet been initialized.
+  It will ASSERT() if gRT is NULL or gBS is NULL.
+  It will ASSERT() if that operation fails.
 
   @param[in]  ImageHandle   The firmware allocated handle for the EFI image.
   @param[in]  SystemTable   A pointer to the EFI System Table.
@@ -85,13 +87,13 @@ RuntimeDriverLibConstruct (
 {
   EFI_STATUS  Status;
 
+  ASSERT (gRT != NULL);
+  ASSERT (gBS != NULL);
+
   mRT = gRT;
-  ASSERT (mRT != NULL);
-  
   //
   // Register SetVirtualAddressMap () notify function
   //
-  ASSERT (gBS != NULL);
   Status = gBS->CreateEvent (
                   EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
                   TPL_NOTIFY,
@@ -116,9 +118,10 @@ RuntimeDriverLibConstruct (
 }
 
 /**
-  This routine will free some resources which have been allocated in
-  EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,
-  it must call this routine to free the allocated resource before the exiting.
+  If a runtime driver exits with an error, it must call this routine 
+  to free the allocated resource before the exiting.
+  It will ASSERT() if gBS is NULL.
+  It will ASSERT() if that operation fails.
 
   @param[in]  ImageHandle   The firmware allocated handle for the EFI image.
   @param[in]  SystemTable   A pointer to the EFI System Table.
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
index 66157fe..fce10c6 100644
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
@@ -15,7 +15,7 @@
 #ifndef __RUNTIMELIBINTERNAL_H__
 #define __RUNTIMELIBINTERNAL_H__
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Library/UefiRuntimeLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
index 941426e..b4479d0 100644
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
@@ -6,7 +6,7 @@
   OS virtual address space. All pointer values are different for a virtual 
   mapping than from the normal physical mapping at boot services time.
 
-  Copyright (c) 2006 - 2007, Intel Corporation.<BR>
+  Copyright (c) 2006 - 2008, Intel Corporation.<BR>
   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        
@@ -17,9 +17,7 @@
 
 **/
 
-#include <PiDxe.h>
-
-#include <RuntimeLibInternal.h>
+#include "RuntimeLibInternal.h"
 
 
 /**
@@ -54,7 +52,7 @@ EfiResetSystem (
                        capabilities.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -95,7 +93,7 @@ EfiSetTime (
   @param  Time    Current alarm clock setting.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -118,7 +116,7 @@ EfiGetWakeupTime (
   @param  Time   Point to alarm clock setting.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -145,7 +143,7 @@ EfiSetWakeupTime (
   @param  Data         Point to return Data-Buffer.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -176,7 +174,7 @@ EfiGetVariable (
                            As output, returns the VendorGuid of the current variable.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -203,7 +201,7 @@ EfiGetNextVariableName (
   @param  Data         Point to the content of the variable.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -226,7 +224,7 @@ EfiSetVariable (
   @param  HighCount Pointer to returned value.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -248,7 +246,7 @@ EfiGetNextHighMonotonicCount (
                              applied.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -269,7 +267,7 @@ EfiConvertPointer (
   @param  ListHead           Head of linked list to convert.
 
   @retval  EFI_SUCCESS  Success to execute the function.
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.
+  @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
 EFI_STATUS
@@ -281,6 +279,13 @@ EfiConvertList (
 {
   LIST_ENTRY  *Link;
   LIST_ENTRY  *NextLink;
+  
+  //
+  // For NULL List, return EFI_SUCCESS
+  //
+  if (ListHead == NULL) {
+    return EFI_SUCCESS;
+  }
 
   //
   // Convert all the ForwardLink & BackLink pointers in the list
diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
index 75bc3fc..90e6135 100644
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -2,7 +2,7 @@
 # Runtime driver library
 #
 # Instance of runtime driver library, Hook VitualAddressChange and
-#  BooterviceExit event and provide runtime service.
+#  BooterviceExit event and provide runtime service for non IPF processor types.
 # Copyright (c) 2006 - 2007, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
@@ -29,7 +29,7 @@
   DESTRUCTOR                     = RuntimeDriverLibDeconstruct
 
 #
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#  VALID_ARCHITECTURES           = IA32 X64 EBC
 #
 
 
diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
index 4889094..e664a0f 100644
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
+++ b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
@@ -12,15 +12,9 @@
 
 **/
 
-
-#include <PiDxe.h>
-
-
-#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Uefi.h>
 #include <Library/DebugLib.h>
 
-#include "UefiRuntimeServicesTableLibInternal.h"
-
 EFI_RUNTIME_SERVICES  *gRT = NULL;
 
 /**
diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLibInternal.h b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLibInternal.h
deleted file mode 100644
index 95ff283..0000000
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLibInternal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/** @file
-  Internal Header file for UEFI Runtime Services Table Library.
-
-  Copyright (c) 2006, Intel Corporation<BR>
-  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
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-
-#ifndef _UEFI_RUNTIME_SERVICES_TABLE_LIB_INTERNAL_H_
-#define _UEFI_RUNTIME_SERVICES_TABLE_LIB_INTERNAL_H_
-/**
-  The constructor function caches the pointer of Runtime Services Table.
-
-  The constructor function caches the pointer of Runtime Services Table.
-  It will ASSERT() if the pointer of Runtime Services Table is NULL.
-  It will always return EFI_SUCCESS.
-
-  @param  ImageHandle   The firmware allocated handle for the EFI image.
-  @param  SystemTable   A pointer to the EFI System Table.
-
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-UefiRuntimeServicesTableLibConstructor (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-;
-#endif
-
diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
index bbf6317..796d731 100644
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
@@ -13,7 +13,7 @@
 **/
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Library/DebugLib.h>
 #include <Library/ScsiLib.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
index 8bfd8c9..99673a3 100644
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
@@ -16,7 +16,7 @@
 #ifndef __UEFI_USB_LIB_INTERNAL_H_
 #define __UEFI_USB_LIB_INTERNAL_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <Library/UsbLib.h>
 #include <Library/BaseMemoryLib.h>
 
diff --git a/Nt32Pkg/MetronomeDxe/Metronome.h b/Nt32Pkg/MetronomeDxe/Metronome.h
index c2d4955..22fa9ab 100644
--- a/Nt32Pkg/MetronomeDxe/Metronome.h
+++ b/Nt32Pkg/MetronomeDxe/Metronome.h
@@ -22,7 +22,7 @@ Abstract:
 #ifndef _NT_THUNK_METRONOME_H_
 #define _NT_THUNK_METRONOME_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <WinNtDxe.h>
 #include <Protocol/Metronome.h>
 #include <Library/BaseLib.h>
diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index 17e657c..647acb1 100644
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -19,7 +19,7 @@ Abstract:
 
 **/
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <WinNtDxe.h>
 #include <Protocol/RealTimeClock.h>
 #include <Library/DebugLib.h>
diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c
index 0ee9a4e..9a19b56 100644
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -19,7 +19,7 @@ Abstract:
 
 **/
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <WinNtDxe.h>
 #include <Protocol/Reset.h>
 #include <Library/DebugLib.h>
diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
index 7769bbf..0c13562 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
@@ -20,7 +20,7 @@ Abstract:
 #ifndef _SNP_NT32_H_
 #define _SNP_NT32_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/SimpleNetwork.h>
 #include <Protocol/DevicePath.h>
diff --git a/Nt32Pkg/TimerDxe/Timer.h b/Nt32Pkg/TimerDxe/Timer.h
index fd680b1..3b7312b 100644
--- a/Nt32Pkg/TimerDxe/Timer.h
+++ b/Nt32Pkg/TimerDxe/Timer.h
@@ -25,7 +25,7 @@ Abstract:
 #define _TIMER_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <WinNtDxe.h>
 #include <Protocol/Timer.h>
 #include <Protocol/Cpu.h>
diff --git a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
index c396f9d..1aa491a 100644
--- a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
+++ b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
@@ -29,7 +29,7 @@ Abstract:
 //
 // The package level header files this module uses
 //
-#include <PiDxe.h>
+#include <Uefi.h>
 #include <WinNtDxe.h>
 //
 // The protocols, PPI and GUID defintions for this module