diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
deleted file mode 100644
index 07972e8c2c..0000000000
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
- IdeBusLite
- DXE_DRIVER
- 5db1d982-602b-4f27-9457-0513fd96ef00
- 1.0
- Component description file for PS2 keyboard module.
- FIX ME!
- Copyright (c) 2004-2006, 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
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64 IPF EBC
- false
- IdeBusLite
-
-
-
- DebugLib
-
-
- UefiDriverModelLib
-
-
- UefiDriverEntryPoint
-
-
- BaseLib
-
-
- UefiLib
-
-
- BaseMemoryLib
-
-
- PerformanceLib
-
-
- UefiBootServicesTableLib
-
-
- UefiRuntimeServicesTableLib
-
-
- DevicePathLib
-
-
-
- idebus.h
- ide.h
- idedata.h
- idebus.c
- ide.c
- ata.c
- atapi.c
-
-
-
-
-
-
-
- gEfiDevicePathProtocolGuid
-
-
- gEfiPciIoProtocolGuid
-
-
- gEfiIdeControllerInitProtocolGuid
-
-
- gEfiBlockIoProtocolGuid
-
-
- gEfiDiskInfoProtocolGuid
-
-
-
-
- gEfiDiskInfoIdeInterfaceGuid
-
-
- gEfiDiskInfoScsiInterfaceGuid
-
-
- gEfiDiskInfoUsbInterfaceGuid
-
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
- gIDEBusDriverBinding
-
-
- gIDEBusComponentName
-
-
-
\ No newline at end of file
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
deleted file mode 100644
index 95c463215b..0000000000
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
- LightPciBusPciBus
- DXE_DRIVER
- C0734D12-7927-432b-986B-A7E3A35BA005
- 1.0
- Component description file for LightPciBus module.
- FIX ME!
- Copyright (c) 2004-2006, 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
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64 IPF EBC
- false
- LightPciBusPciBus
-
-
-
- DebugLib
-
-
- UefiDriverModelLib
-
-
- UefiDriverEntryPoint
-
-
- BaseLib
-
-
- UefiLib
-
-
- BaseMemoryLib
-
-
- ReportStatusCodeLib
-
-
- UefiBootServicesTableLib
-
-
- DevicePathLib
-
-
- MemoryAllocationLib
-
-
-
- PciBus.h
- PciIo.h
- PciCommand.h
- PciDeviceSupport.h
- PciResourceSupport.h
- PciEnumerator.h
- PciEnumeratorSupport.h
- PciOptionRomSupport.h
- PciRomTable.h
- PciLib.h
- PciRomTable.c
- PciDriverOverride.h
- PciPowerManagement.h
- PciPowerManagement.c
- PciDriverOverride.c
- PciOptionRomSupport.c
- PciEnumerator.c
- PciEnumeratorSupport.c
- PciResourceSupport.c
- PciCommand.c
- ComponentName.c
- PciDeviceSupport.c
- PciHotPlugSupport.c
- pcibus.c
- PciIo.c
- LightPciLib.c
-
-
-
-
-
-
-
- gEfiDevicePathProtocolGuid
-
-
- gEfiPciRootBridgeIoProtocolGuid
-
-
- gEfiDecompressProtocolGuid
-
-
- gEfiUgaIoProtocolGuid
-
-
- gEfiPciPlatformProtocolGuid
-
-
- gEfiPciIoProtocolGuid
-
-
- gEfiBusSpecificDriverOverrideProtocolGuid
-
-
- gEfiPciHotPlugRequestProtocolGuid
-
-
- gEfiIncompatiblePciDeviceSupportProtocolGuid
-
-
- gEfiPciHotPlugInitProtocolGuid
-
-
- gEfiPciHostBridgeResourceAllocationProtocolGuid
-
-
- gEfiLoadedImageProtocolGuid
-
-
-
-
- gEfiPciOptionRomTableGuid
-
-
- gEfiPciHotplugDeviceGuid
-
-
- gEfiStatusCodeSpecificDataGuid
-
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
- PciBusEntryPoint
-
-
- gPciBusDriverBinding
-
-
- gPciBusComponentName
-
-
-
\ No newline at end of file
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 5cfb3847fa..2f38891f36 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -84,6 +84,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
PciEnumeratorSupport.c
PciResourceSupport.c
PciCommand.c
+ ComponentName.h
ComponentName.c
PciDeviceSupport.c
pcibus.c
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
deleted file mode 100644
index 588d78c51d..0000000000
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
- PciBusPciBusLite
- DXE_DRIVER
- 4b186349-7da2-454d-8187-99d85fa03b5c
- 1.0
- Component description file for LightPciBus module.
- FIX ME!
- Copyright (c) 2004-2006, 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
- 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.
- FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
-
-
- IA32 X64 IPF EBC
- false
- PciBusPciBusLite
-
-
-
- DebugLib
-
-
- UefiDriverModelLib
-
-
- UefiDriverEntryPoint
-
-
- BaseLib
-
-
- UefiLib
-
-
- BaseMemoryLib
-
-
- ReportStatusCodeLib
-
-
- UefiBootServicesTableLib
-
-
- DevicePathLib
-
-
- MemoryAllocationLib
-
-
-
- PciBus.h
- PciIo.h
- PciCommand.h
- PciDeviceSupport.h
- PciResourceSupport.h
- PciEnumerator.h
- PciEnumeratorSupport.h
- PciOptionRomSupport.h
- PciRomTable.h
- PciLib.h
- PciRomTable.c
- PciDriverOverride.h
- PciPowerManagement.h
- PciPowerManagement.c
- PciDriverOverride.c
- PciOptionRomSupport.c
- PciEnumerator.c
- PciEnumeratorSupport.c
- PciResourceSupport.c
- PciCommand.c
- PciDeviceSupport.c
- PciHotPlugSupport.c
- pcibus.c
- PciIo.c
- LightPciLib.c
-
-
-
-
-
-
-
- gEfiDevicePathProtocolGuid
-
-
- gEfiPciRootBridgeIoProtocolGuid
-
-
- gEfiDecompressProtocolGuid
-
-
- gEfiUgaIoProtocolGuid
-
-
- gEfiPciPlatformProtocolGuid
-
-
- gEfiPciIoProtocolGuid
-
-
- gEfiBusSpecificDriverOverrideProtocolGuid
-
-
- gEfiPciHotPlugRequestProtocolGuid
-
-
- gEfiIncompatiblePciDeviceSupportProtocolGuid
-
-
- gEfiPciHotPlugInitProtocolGuid
-
-
- gEfiPciHostBridgeResourceAllocationProtocolGuid
-
-
- gEfiLoadedImageProtocolGuid
-
-
-
-
- gEfiPciOptionRomTableGuid
-
-
- gEfiPciHotplugDeviceGuid
-
-
- gEfiStatusCodeSpecificDataGuid
-
-
-
- EFI_SPECIFICATION_VERSION 0x00020000
- EDK_RELEASE_VERSION 0x00020000
-
- PciBusEntryPoint
-
-
- gPciBusDriverBinding
-
-
- gPciBusComponentName
-
-
-
\ No newline at end of file
diff --git a/EdkModulePkg/Core/DxeIplPeim/build_X64.xml b/EdkModulePkg/Core/DxeIplPeim/build_X64.xml
deleted file mode 100644
index aef68ec4dc..0000000000
--- a/EdkModulePkg/Core/DxeIplPeim/build_X64.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index fe5e67eabd..7c4ce5874b 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -64,6 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
PeiMain.h
BootMode/BootMode.c
+ Dependency/dependency.h
Dependency/dependency.c
Dispatcher/Dispatcher.c
FwVol/FwVol.c
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 84234060d1..2d2b2a8e1c 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -82,10 +82,7 @@
Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa
Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
Bus/Pci/IdeBus/Dxe/idebus.msa
- Bus/Pci/IdeBus/Dxe/idebusLite.msa
- Bus/Pci/PciBus/Dxe/LightPciBus.msa
Bus/Pci/PciBus/Dxe/PciBus.msa
- Bus/Pci/PciBus/Dxe/PciBusLite.msa
Bus/Pci/Uhci/Dxe/Uhci.msa
Bus/Pci/Undi/RuntimeDxe/Undi.msa
Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
diff --git a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
index 2f68b56c1e..6cb8fdb3f8 100644
--- a/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
+++ b/EdkModulePkg/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa
@@ -42,6 +42,7 @@
+ RuntimeLibInternal.h
Common/RuntimeLib.c
Common/RuntimeService.c
Common/RuntimeLib.c
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index c4937f71ad..d3a1744216 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -54,6 +54,7 @@
+ Fvb.h
Ia32/Fvb.c
x64/Fvb.c
Ipf/Fvb.c
diff --git a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa
index a3c9a79d1f..4f98c84687 100644
--- a/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa
+++ b/EdkModulePkg/Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa
@@ -27,6 +27,7 @@
+ CustomizedDecompress.h
CustomizedDecompress.c
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
index efa9173c4c..57a57fa017 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
GraphicsConsole.h
GraphicsConsole.c
LaffStd.c
+ ComponentName.h
ComponentName.c
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 55b2f6f8b9..a922c0aeb4 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -50,6 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
DebugSupport.c
DebugSupport.dxs
Ia32/AsmFuncs.asm
+ Ia32/plDebugSupport.h
Ia32/plDebugSupport.c
ipf/AsmFuncs.s
ipf/common.i
diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
index c87e198dac..abd5246ce3 100644
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
+++ b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.msa
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+ UnicodeCollationEng.h
UnicodeCollationEng.c
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index 12f070c301..b874f593b7 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -56,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+ Variable.h
EmuVariable.c
EmuVariable.dxs
InitVariable.c
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index c98455f3ef..cfb4c831e1 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -56,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+ FtwLite.h
FtwLite.c
FtwMisc.c
FtwWorkSpace.c
diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
index 94530998bf..3e9fa81711 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
@@ -54,6 +54,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
Crc32SectionExtract.h
GuidedSection.c
GuidedSection.h
+ Crc32SectionExtract.dxs
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
index a1282a27aa..27d47a16ae 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+ BaseMemoryTest.h
BaseMemoryTest.c
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index 8557cc494e..66290569f9 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -67,6 +67,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
pxe_bc_mtftp.c
pxe_bc_udp.c
pxe_loadfile.c
+ hton.h
+ tftp.h
dhcp.h
bc.h
ip.h
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
index 322abc8843..1b99a17ee6 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa
@@ -73,6 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
VfrStrings.uni
Vfr.vfr
DriverSample.c
+ NVDataStruc.h
DriverSample.h
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
index d2d3c42cc2..beb4f81d65 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa
@@ -76,6 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
ProcessOptions.c
Ui.c
Ui.h
+ Colors.h
diff --git a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
new file mode 100644
index 0000000000..83031e9788
--- /dev/null
+++ b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
@@ -0,0 +1,27 @@
+/*++
+
+Copyright (c) 2006, 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
+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.
+
+Module Name:
+
+ VarMachine.h
+
+Abstract:
+
+ Variable Machine Type
+
+--*/
+
+#ifndef _VAR_MACHINE_H
+#define _VAR_MACHINE_H
+
+#define ALIGNMENT 1
+
+#endif
diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.c b/EdkModulePkg/Universal/Variable/Pei/Variable.c
index b2286c1860..9561ad13d6 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.c
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.c
@@ -19,10 +19,7 @@ Abstract:
--*/
-
-#include
#include
-#include
//
// Module globals
diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.h b/EdkModulePkg/Universal/Variable/Pei/Variable.h
index 2a6f861def..ac7c579029 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.h
@@ -26,8 +26,7 @@ Abstract:
// BugBug: We need relcate the head file.
//
#include
-
-#define ALIGNMENT 1
+#include
//
// Define GET_PAD_SIZE to optimize compiler
diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.msa b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
index 3889f0deaf..88adcda4a9 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
@@ -30,6 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
PeiVariable
+
+ BaseLib
+
DebugLib
@@ -44,8 +47,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+ Variable.h
Variable.c
Variable.dxs
+ Ia32/VarMachine.h
+ Ebc/VarMachine.h
+ x64/VarMachine.h
+ Ipf/VarMachine.h
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 99691f4943..12248a5b3f 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -65,7 +65,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+ Variable.h
Variable.c
+ reclaim.h
reclaim.c
InitVariable.c
Ia32Variable.dxs
diff --git a/EdkNt32Pkg/Build/Nt32Common.xml b/EdkNt32Pkg/Build/Nt32Common.xml
deleted file mode 100644
index 7d996fe5c9..0000000000
--- a/EdkNt32Pkg/Build/Nt32Common.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
index 36bdc1563f..758bdd3e5e 100644
--- a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
+++ b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
@@ -64,6 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
ConPlatform.c
ConPlatform.h
+ ComponentName.h
ComponentName.c
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
index 93da24c999..5dd9170816 100644
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
@@ -60,6 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
MiscSubclassDriver.uni
+ MiscDevicePath.h
MiscSubclassDriver.h
MiscSubclassDriverEntryPoint.c
MiscSubclassDriverDataTable.c
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index 077c5b32b1..07373a2d6c 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -90,18 +90,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
PlatformData.c
+ BdsPlatform.h
BdsPlatform.c
+ Generic\Bds.h
Generic\BdsEntry.c
+ Generic\FrontPage.h
Generic\FrontPage.c
Generic\FrontPageStrings.uni
Generic\FrontPageVfr.vfr
+ Generic\Language.h
Generic\Language.c
+ Generic\String.h
Generic\String.c
Generic\Strings.uni
Generic\Capsules.c
Generic\MemoryTest.c
Generic\BootMaint\BmString.uni
Generic\BootMaint\bm.vfr
+ Generic\BootMaint\BBSsupport.h
+ Generic\BootMaint\BootMaint.h
+ Generic\BootMaint\FormGuid.h
Generic\BootMaint\BmLib.c
Generic\BootMaint\BootOption.c
Generic\BootMaint\ConsoleOption.c
@@ -112,9 +120,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
Generic\BootMaint\BootMaint.c
Generic\BootMaint\FileExplorer.c
Generic\BootMaint\FE.vfr
+ Generic\BootMngr\BootManager.h
Generic\BootMngr\BootManager.c
Generic\BootMngr\BootManagerStrings.uni
Generic\BootMngr\BootManagerVfr.vfr
+ Generic\DeviceMngr\DeviceManager.h
Generic\DeviceMngr\DeviceManager.c
Generic\DeviceMngr\DeviceManagerStrings.uni
Generic\DeviceMngr\DeviceManagerVfr.vfr
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index c0e117afef..d514723320 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -67,6 +67,7 @@
BdsConsole.c
BdsConnect.c
DevicePath.c
+ Performance.h
Performance.c
BdsMisc.c
Ipf\ShadowRom.c
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
index 87d8529be5..bb58d03ec5 100644
--- a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
@@ -45,6 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
MonoStatusCode.dxs
+ MonoStatusCode.h
MonoStatusCode.c
PlatformStatusCode.c