diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 7443009e2e..1ed7b39136 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -77,6 +77,316 @@
+
+
+ Include/Common/CapsuleName.h
+
+
+
+ Include/Common/DecompressLibraryHob.h
+
+
+
+ Include/Common/FlashMap.h
+
+
+
+ Include/Common/Variable.h
+
+
+
+ Include/Common/WorkingBlockHeader.h
+
+
+
+ Include/Guid/AlternateFvBlock.h
+
+
+
+ Include/Guid/Bmp.h
+
+
+
+ Include/Guid/BootState.h
+
+
+
+ Include/Guid/CapsuleVendor.h
+
+
+
+ Include/Guid/CompatibleMemoryTested.h
+
+
+
+ Include/Guid/ConsoleInDevice.h
+
+
+
+ Include/Guid/ConsoleOutDevice.h
+
+
+
+ Include/Guid/ExtendedSalGuid.h
+
+
+
+ Include/Guid/FlashMapHob.h
+
+
+
+ Include/Guid/HotPlugDevice.h
+
+
+
+ Include/Guid/MemoryTypeInformation.h
+
+
+
+ Include/Guid/MiniShellFile.h
+
+
+
+ Include/Guid/PciHotplugDevice.h
+
+
+
+ Include/Guid/PciOptionRomTable.h
+
+
+
+ Include/Guid/PeiPeCoffLoader.h
+
+
+
+ Include/Guid/PeiPerformanceHob.h
+
+
+
+ Include/Guid/PrimaryConsoleInDevice.h
+
+
+
+ Include/Guid/PrimaryConsoleOutDevice.h
+
+
+
+ Include/Guid/PrimaryStandardErrorDevice.h
+
+
+
+ Include/Guid/ShellFile.h
+
+
+
+ Include/Guid/StandardErrorDevice.h
+
+
+
+ Include/Guid/StatusCode.h
+
+
+
+ Include/Guid/StatusCodeCallerId.h
+
+
+
+ Include/Guid/SystemNvDataGuid.h
+
+
+
+ Include/Library/CustomDecompressLib.h
+
+
+
+ Include/Library/EdkBsDataHubStatusCodeLib.h
+
+
+
+ Include/Library/EdkDxeSalLib.h
+
+
+
+ Include/Library/EdkFvbServiceLib.h
+
+
+
+ Include/Library/EdkGraphicsLib.h
+
+
+
+ Include/Library/EdkIfrSupportLib.h
+
+
+
+ Include/Library/EdkMemoryStatusCodeLib.h
+
+
+
+ Include/Library/EdkPeCoffLoaderLib.h
+
+
+
+ Include/Library/EdkPeCoffLoaderX64Lib.h
+
+
+
+ Include/Library/EdkRtMemoryStatusCodeLib.h
+
+
+
+ Include/Library/EdkRtPlatformStatusCodeLib.h
+
+
+
+ Include/Library/EdkScsiLib.h
+
+
+
+ Include/Library/EdkUsbLib.h
+
+
+
+ Include/Library/TianoDecompressLib.h
+
+
+
+ Include/Ppi/BaseMemoryTest.h
+
+
+
+ Include/Ppi/FlashMap.h
+
+
+
+ Include/Ppi/PeiInMemory.h
+
+
+
+ Include/Ppi/StatusCodeMemory.h
+
+
+
+ Include/Protocol/AcpiS3Save.h
+
+
+
+ Include/Protocol/Capsule.h
+
+
+
+ Include/Protocol/ConsoleControl.h
+
+
+
+ Include/Protocol/CustomizedDecompress.h
+
+
+
+ Include/Protocol/DebugAssert.h
+
+
+
+ Include/Protocol/DebugLevel.h
+
+
+
+ Include/Protocol/DiskInfo.h
+
+
+
+ Include/Protocol/EdkDecompress.h
+
+
+
+ Include/Protocol/ExtendedSalBootService.h
+
+
+
+ Include/Protocol/FaultTolerantWriteLite.h
+
+
+
+ Include/Protocol/FvbExtension.h
+
+
+
+ Include/Protocol/GenericMemoryTest.h
+
+
+
+ Include/Protocol/IsaAcpi.h
+
+
+
+ Include/Protocol/IsaIo.h
+
+
+
+ Include/Protocol/LoadPe32Image.h
+
+
+
+ Include/Protocol/OEMBadging.h
+
+
+
+ Include/Protocol/PciHotPlugRequest.h
+
+
+
+ Include/Protocol/Performance.h
+
+
+
+ Include/Protocol/Print.h
+
+
+
+ Include/Protocol/PxeDhcp4.h
+
+
+
+ Include/Protocol/PxeDhcp4CallBack.h
+
+
+
+ Include/Protocol/ScsiIo.h
+
+
+
+ Include/Protocol/SecurityPolicy.h
+
+
+
+ Include/Protocol/UgaIo.h
+
+
+
+ Include/Protocol/UgaSplash.h
+
+
+
+ Include/Protocol/usbatapi.h
+
+
+
+ Include/EdkDxe.h
+
+
+
+ Include/EdkDxeCore.h
+
+
+
+ Include/EdkPeiCore.h
+
+
+
+ Include/EdkPeim.h
+
+
+
Application/HelloWorld/HelloWorld.msa
Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index bb973a4dec..6a5dbde5d9 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -29,6 +29,56 @@
+
+
+ Include/Common/WinNTInclude.h
+
+
+
+ Include/library/EdkGenericBdsLib.h
+
+
+
+ Include/library/WinNtLib.h
+
+
+
+ Include/Ppi/NtAutoscan.h
+
+
+
+ Include/Ppi/NtFwh.h
+
+
+
+ Include/Ppi/NtPeiLoadFile.h
+
+
+
+ Include/Ppi/NtThunk.h
+
+
+
+ Include/Protocol/WinNtIo.h
+
+
+
+ Include/Protocol/WinNtThunk.h
+
+
+
+ Include/FlashLayout.h
+
+
+
+ Include/WinNtDxe.h
+
+
+
+ Include/WinNtPeim.h
+
+
+
Dxe/ConPlatform/ConPlatform.msa
Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 71415164ec..1dd52ca07a 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -179,6 +179,952 @@
+
+
+ Include/Common/BaseTypes.h
+
+
+
+ Include/Common/BootMode.h
+
+
+
+ Include/Common/BootScript.h
+
+
+
+ Include/Common/Capsule.h
+
+
+
+ Include/Common/DataHubRecords.h
+
+
+
+ Include/Common/Dependency.h
+
+
+
+ Include/Common/EfiImage.h
+
+
+
+ Include/Common/FirmwareFileSystem.h
+
+
+
+ Include/Common/FirmwareVolumeHeader.h
+
+
+
+ Include/Common/FirmwareVolumeImageFormat.h
+
+
+
+ Include/Common/Hob.h
+
+
+
+ Include/Common/InternalFormRepresentation.h
+
+
+
+ Include/Common/Legacy16.h
+
+
+
+ Include/Common/MultiPhase.h
+
+
+
+ Include/Common/StatusCode.h
+
+
+
+ Include/Common/StatusCodeDataTypeId.h
+
+
+
+ Include/Common/UefiBaseTypes.h
+
+
+
+ Include/Dxe/ArchProtocol/Bds.h
+
+
+
+ Include/Dxe/ArchProtocol/Cpu.h
+
+
+
+ Include/Dxe/ArchProtocol/Metronome.h
+
+
+
+ Include/Dxe/ArchProtocol/MonotonicCounter.h
+
+
+
+ Include/Dxe/ArchProtocol/RealTimeClock.h
+
+
+
+ Include/Dxe/ArchProtocol/Reset.h
+
+
+
+ Include/Dxe/ArchProtocol/Runtime.h
+
+
+
+ Include/Dxe/ArchProtocol/Security.h
+
+
+
+ Include/Dxe/ArchProtocol/SecurityPolicy.h
+
+
+
+ Include/Dxe/ArchProtocol/StatusCode.h
+
+
+
+ Include/Dxe/ArchProtocol/Timer.h
+
+
+
+ Include/Dxe/ArchProtocol/Variable.h
+
+
+
+ Include/Dxe/ArchProtocol/VariableWrite.h
+
+
+
+ Include/Dxe/ArchProtocol/WatchdogTimer.h
+
+
+
+ Include/Dxe/DxeCis.h
+
+
+
+ Include/Dxe/SmmCis.h
+
+
+
+ Include/Ebc/ProcessorBind.h
+
+
+
+ Include/Guid/Acpi.h
+
+
+
+ Include/Guid/AcpiTableStorage.h
+
+
+
+ Include/Guid/Apriori.h
+
+
+
+ Include/Guid/Capsule.h
+
+
+
+ Include/Guid/DataHubRecords.h
+
+
+
+ Include/Guid/DebugImageInfoTable.h
+
+
+
+ Include/Guid/DxeServices.h
+
+
+
+ Include/Guid/EventGroup.h
+
+
+
+ Include/Guid/EventLegacyBios.h
+
+
+
+ Include/Guid/FirmwareFileSystem.h
+
+
+
+ Include/Guid/FrameworkDevicePath.h
+
+
+
+ Include/Guid/GlobalVariable.h
+
+
+
+ Include/Guid/Gpt.h
+
+
+
+ Include/Guid/HobList.h
+
+
+
+ Include/Guid/MemoryAllocationHob.h
+
+
+
+ Include/Guid/Mps.h
+
+
+
+ Include/Guid/PcAnsi.h
+
+
+
+ Include/Guid/SalSystemTable.h
+
+
+
+ Include/Guid/SmBios.h
+
+
+
+ Include/Guid/SmmCommunicate.h
+
+
+
+ Include/Guid/SmramMemoryReserve.h
+
+
+
+ Include/Guid/StatusCodeDataTypeId.h
+
+
+
+ Include/Ia32/ProcessorBind.h
+
+
+
+ Include/IndustryStandard/Acpi.h
+
+
+
+ Include/IndustryStandard/pci22.h
+
+
+
+ Include/IndustryStandard/scsi.h
+
+
+
+ Include/IndustryStandard/Usb.h
+
+
+
+ Include/Ipf/IpfDefines.h
+
+
+
+ Include/Ipf/IpfMacro.i
+
+
+
+ Include/Ipf/ProcessorBind.h
+
+
+
+ Include/Ipf/SalApi.h
+
+
+
+ Include/Library/BaseLib.h
+
+
+
+ Include/Library/BaseMemoryLib.h
+
+
+
+ Include/Library/CacheMaintenanceLib.h
+
+
+
+ Include/Library/CpuLib.h
+
+
+
+ Include/Library/DebugLib.h
+
+
+
+ Include/Library/DevicePathLib.h
+
+
+
+ Include/Library/DxeCoreEntryPoint.h
+
+
+
+ Include/Library/DxeRuntimeDriverLib.h
+
+
+
+ Include/Library/DxeServicesTableLib.h
+
+
+
+ Include/Library/DxeSmmDriverEntryPoint.h
+
+
+
+ Include/Library/HiiLib.h
+
+
+
+ Include/Library/HobLib.h
+
+
+
+ Include/Library/IoLib.h
+
+
+
+ Include/Library/MemoryAllocationLib.h
+
+
+
+ Include/Library/PcdLib.h
+
+
+
+ Include/Library/PciCf8Lib.h
+
+
+
+ Include/Library/PciExpressLib.h
+
+
+
+ Include/Library/PciLib.h
+
+
+
+ Include/Library/PciSegmentLib.h
+
+
+
+ Include/Library/PeCoffGetEntryPointLib.h
+
+
+
+ Include/Library/PeCoffLib.h
+
+
+
+ Include/Library/PeiCoreEntryPoint.h
+
+
+
+ Include/Library/PeimEntryPoint.h
+
+
+
+ Include/Library/PeiServicesLib.h
+
+
+
+ Include/Library/PeiServicesTablePointerLib.h
+
+
+
+ Include/Library/PerformanceLib.h
+
+
+
+ Include/Library/PostCodeLib.h
+
+
+
+ Include/Library/PrintLib.h
+
+
+
+ Include/Library/ReportStatusCodeLib.h
+
+
+
+ Include/Library/ResourcePublicationLib.h
+
+
+
+ Include/Library/SmbusLib.h
+
+
+
+ Include/Library/TimerLib.h
+
+
+
+ Include/Library/UefiBootServicesTableLib.h
+
+
+
+ Include/Library/UefiDecompressLib.h
+
+
+
+ Include/Library/UefiDriverEntryPoint.h
+
+
+
+ Include/Library/UefiDriverModelLib.h
+
+
+
+ Include/Library/UefiLib.h
+
+
+
+ Include/Library/UefiRuntimeServicesTableLib.h
+
+
+
+ Include/Peim/PeiCis.h
+
+
+
+ Include/Ppi/BlockIo.h
+
+
+
+ Include/Ppi/BootInRecoveryMode.h
+
+
+
+ Include/Ppi/BootScriptExecuter.h
+
+
+
+ Include/Ppi/CpuIo.h
+
+
+
+ Include/Ppi/DeviceRecoveryModule.h
+
+
+
+ Include/Ppi/DxeIpl.h
+
+
+
+ Include/Ppi/EndOfPeiPhase.h
+
+
+
+ Include/Ppi/FindFv.h
+
+
+
+ Include/Ppi/LoadFile.h
+
+
+
+ Include/Ppi/MasterBootMode.h
+
+
+
+ Include/Ppi/MemoryDiscovered.h
+
+
+
+ Include/Ppi/Pcd.h
+
+
+
+ Include/Ppi/PciCfg.h
+
+
+
+ Include/Ppi/ReadOnlyVariable.h
+
+
+
+ Include/Ppi/RecoveryModule.h
+
+
+
+ Include/Ppi/Reset.h
+
+
+
+ Include/Ppi/S3Resume.h
+
+
+
+ Include/Ppi/SecPlatformInformation.h
+
+
+
+ Include/Ppi/SectionExtraction.h
+
+
+
+ Include/Ppi/Security.h
+
+
+
+ Include/Ppi/Smbus.h
+
+
+
+ Include/Ppi/Stall.h
+
+
+
+ Include/Ppi/StatusCode.h
+
+
+
+ Include/Protocol/AcpiSupport.h
+
+
+
+ Include/Protocol/Arp.h
+
+
+
+ Include/Protocol/AuthenticationInfo.h
+
+
+
+ Include/Protocol/Bis.h
+
+
+
+ Include/Protocol/BlockIo.h
+
+
+
+ Include/Protocol/BootScriptSave.h
+
+
+
+ Include/Protocol/BusSpecificDriverOverride.h
+
+
+
+ Include/Protocol/ComponentName.h
+
+
+
+ Include/Protocol/CpuIo.h
+
+
+
+ Include/Protocol/DataHub.h
+
+
+
+ Include/Protocol/DebugPort.h
+
+
+
+ Include/Protocol/DebugSupport.h
+
+
+
+ Include/Protocol/Decompress.h
+
+
+
+ Include/Protocol/DeviceIo.h
+
+
+
+ Include/Protocol/DevicePath.h
+
+
+
+ Include/Protocol/DevicePathFromText.h
+
+
+
+ Include/Protocol/DevicePathToText.h
+
+
+
+ Include/Protocol/DevicePathUtilities.h
+
+
+
+ Include/Protocol/Dhcp4.h
+
+
+
+ Include/Protocol/DiskIo.h
+
+
+
+ Include/Protocol/DriverBinding.h
+
+
+
+ Include/Protocol/DriverConfiguration.h
+
+
+
+ Include/Protocol/DriverDiagnostics.h
+
+
+
+ Include/Protocol/Ebc.h
+
+
+
+ Include/Protocol/EdidActive.h
+
+
+
+ Include/Protocol/EdidDiscovered.h
+
+
+
+ Include/Protocol/EdidOverride.h
+
+
+
+ Include/Protocol/EfiNetworkInterfaceIdentifier.h
+
+
+
+ Include/Protocol/FileInfo.h
+
+
+
+ Include/Protocol/FileSystemInfo.h
+
+
+
+ Include/Protocol/FileSystemVolumeLabelInfo.h
+
+
+
+ Include/Protocol/FirmwareVolume.h
+
+
+
+ Include/Protocol/FirmwareVolumeBlock.h
+
+
+
+ Include/Protocol/FirmwareVolumeDispatch.h
+
+
+
+ Include/Protocol/FormBrowser.h
+
+
+
+ Include/Protocol/FormCallback.h
+
+
+
+ Include/Protocol/GraphicsOutput.h
+
+
+
+ Include/Protocol/GuidedSectionExtraction.h
+
+
+
+ Include/Protocol/Hash.h
+
+
+
+ Include/Protocol/Hii.h
+
+
+
+ Include/Protocol/IdeControllerInit.h
+
+
+
+ Include/Protocol/IncompatiblePciDeviceSupport.h
+
+
+
+ Include/Protocol/IP4.h
+
+
+
+ Include/Protocol/IP4Config.h
+
+
+
+ Include/Protocol/IScsiInitatorName.h
+
+
+
+ Include/Protocol/Legacy8259.h
+
+
+
+ Include/Protocol/LegacyBios.h
+
+
+
+ Include/Protocol/LegacyBiosPlatform.h
+
+
+
+ Include/Protocol/LegacyInterrupt.h
+
+
+
+ Include/Protocol/LegacyRegion.h
+
+
+
+ Include/Protocol/LoadedImage.h
+
+
+
+ Include/Protocol/LoadFile.h
+
+
+
+ Include/Protocol/ManagedNetwork.h
+
+
+
+ Include/Protocol/Mtftp4.h
+
+
+
+ Include/Protocol/Pcd.h
+
+
+
+ Include/Protocol/PciHostBridgeResourceAllocation.h
+
+
+
+ Include/Protocol/PciHotPlugInit.h
+
+
+
+ Include/Protocol/PciIo.h
+
+
+
+ Include/Protocol/PciPlatform.h
+
+
+
+ Include/Protocol/PciRootBridgeIo.h
+
+
+
+ Include/Protocol/PlatformDriverOverride.h
+
+
+
+ Include/Protocol/PxeBaseCode.h
+
+
+
+ Include/Protocol/PxeBaseCodeCallBack.h
+
+
+
+ Include/Protocol/ScsiIoExt.h
+
+
+
+ Include/Protocol/ScsiPassThru.h
+
+
+
+ Include/Protocol/ScsiPassThruExt.h
+
+
+
+ Include/Protocol/SectionExtraction.h
+
+
+
+ Include/Protocol/SerialIo.h
+
+
+
+ Include/Protocol/ServiceBinding.h
+
+
+
+ Include/Protocol/SimpleFileSystem.h
+
+
+
+ Include/Protocol/SimpleNetwork.h
+
+
+
+ Include/Protocol/SimplePointer.h
+
+
+
+ Include/Protocol/SimpleTextIn.h
+
+
+
+ Include/Protocol/SimpleTextOut.h
+
+
+
+ Include/Protocol/Smbus.h
+
+
+
+ Include/Protocol/SmmAccess.h
+
+
+
+ Include/Protocol/SmmBase.h
+
+
+
+ Include/Protocol/SmmControl.h
+
+
+
+ Include/Protocol/SmmGpiDispatch.h
+
+
+
+ Include/Protocol/SmmIchnDispatch.h
+
+
+
+ Include/Protocol/SmmPeriodicTimerDispatch.h
+
+
+
+ Include/Protocol/SmmPowerButtonDispatch.h
+
+
+
+ Include/Protocol/SmmStandbyButtonDispatch.h
+
+
+
+ Include/Protocol/SmmStatusCode.h
+
+
+
+ Include/Protocol/SmmSwDispatch.h
+
+
+
+ Include/Protocol/SmmSxDispatch.h
+
+
+
+ Include/Protocol/SmmUsbDispatch.h
+
+
+
+ Include/Protocol/TapeIo.h
+
+
+
+ Include/Protocol/Tcp4.h
+
+
+
+ Include/Protocol/Udp4.h
+
+
+
+ Include/Protocol/UgaDraw.h
+
+
+
+ Include/Protocol/UnicodeCollation.h
+
+
+
+ Include/Protocol/Usb2HostController.h
+
+
+
+ Include/Protocol/UsbHostController.h
+
+
+
+ Include/Protocol/UsbIo.h
+
+
+
+ Include/Uefi/EfiPxe.h
+
+
+
+ Include/Uefi/Errors.h
+
+
+
+ Include/Uefi/UefiSpec.h
+
+
+
+ Include/x64/ProcessorBind.h
+
+
+
+ Include/Base.h
+
+
+
+ Include/Dxe.h
+
+
+
+ Include/DxeCore.h
+
+
+
+ Include/DxeDepex.h
+
+
+
+ Include/PeiCore.h
+
+
+
+ Include/Peim.h
+
+
+
+ Include/PeimDepex.h
+
+
+
+ Include/PiwgDxe.h
+
+
+
+ Include/PiwgPeim.h
+
+
+
+ Include/Uefi.h
+
+
+
Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
Library/BaseDebugLibNull/BaseDebugLibNull.msa