diff --git a/EdkNt32Pkg/Build/component.def b/EdkNt32Pkg/Build/component.def
deleted file mode 100644
index 1e8484653b..0000000000
--- a/EdkNt32Pkg/Build/component.def
+++ /dev/null
@@ -1,12 +0,0 @@
-; 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.
-
-LIBRARY
-EXPORTS
-   InitializeDriver=_ModuleEntryPoint
diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
index bcbc78b921..0d6627553e 100644
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
+++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
@@ -5,9 +5,9 @@
     <ModuleType>PEIM</ModuleType>
     <GuidValue>434b164e-5fa6-4a3d-bc04-02da2a4eeb26</GuidValue>
     <Version>1.0</Version>
-    <Abstract>Component description file for the PEI library.</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
+    <Abstract>Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.</Abstract>
+    <Description>PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.</Description>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
     <License>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
diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
index be4660b7f9..01f9c9e88b 100644
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
+++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
@@ -5,9 +5,9 @@
     <ModuleType>PEIM</ModuleType>
     <GuidValue>3c5702f2-9b17-4273-b60c-b96e6cd13066</GuidValue>
     <Version>1.0</Version>
-    <Abstract>Component description file for the PEI library.</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>
+    <Abstract>Component description file for the Nt32PeCoffLoaderLib library.</Abstract>
+    <Description>EdkPeCoffLoaderLib library class for NT32 instance implemented by PeiPeCoffLoader PPI.</Description>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
     <License>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
@@ -34,11 +34,11 @@
     <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
   </PackageDependencies>
-  <PPIs>
-    <!--<Ppi Usage="ALWAYS_CONSUMED">
-      <PpiCName>PeCoffLoader</PpiCName>
-    </Ppi>-->
-  </PPIs>
+  <Guids>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>
+    </GuidCNames>
+  </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa
index 4f03377fd7..0fccfe585c 100644
--- a/EdkNt32Pkg/Logo/Logo.msa
+++ b/EdkNt32Pkg/Logo/Logo.msa
@@ -26,10 +26,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </MsaHeader>
   <ModuleDefinitions>
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
+    <BinaryModule>true</BinaryModule>
     <OutputFileBasename>Logo</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
+    <Filename ToolCode="DUMMY">Logo_build.xml</Filename>
     <Filename>Logo.bmp</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 48d0f647fd..8f1cb1f2d8 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -6334,11 +6334,11 @@
         <FfsFormatKey>APPLICATION</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-    <ModuleSA SupArchList="X64" PackageGuid="0fd7197b-9bde-44fe-a7e4-d2177a9922e5" ModuleGuid="5058F21C-BC34-11d4-BD18-0080C73C8881">
-      <ModuleSaBuildOptions>
-        <FvBinding>FV_RECOVERY</FvBinding>
-        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>
-      </ModuleSaBuildOptions>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fd7197b-9bde-44fe-a7e4-d2177a9922e5" ModuleGuid="5058F21C-BC34-11d4-BD18-0080C73C8881">
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="6987936E-ED34-44db-AE97-1FA5E4ED2116">
       <Libraries>
@@ -6554,7 +6554,7 @@
       </Option>
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO", "/LTCG"</Option>
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">
-        "/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/DEF:${PLATFORM_DIR}\Build\component.def", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"
+        "/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"
       </Option>
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
@@ -6569,7 +6569,7 @@
       </Option>
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO", "/LTCG"</Option>
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">
-        "/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/DEF:${PLATFORM_DIR}\Build\component.def", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:CONSOLE", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"
+        "/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/EXPORT:InitializeDriver=_ModuleEntryPoint", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:CONSOLE", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"
       </Option>
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
diff --git a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
index 9baab816f0..e5878c9599 100644
--- a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
+++ b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
@@ -68,6 +68,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename SupArchList="IA32">nt32\FwBlockService.c</Filename>
     <Filename SupArchList="IA32">nt32\FwBlockService.h</Filename>
     <Filename SupArchList="IA32">nt32\FvbInfo.c</Filename>
+    <Filename ToolCode="DUMMY">Common\FWBlockService.c</Filename>
+    <Filename ToolCode="DUMMY">Common\FwBlockService.h</Filename>
+    <Filename ToolCode="DUMMY">Common\ia32\Ia32Fwh.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 436dcc8b7f..535d7351d3 100644
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -53,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
+    <Filename ToolCode="DUMMY">SecMain_build.xml</Filename>
     <Filename>SecMain.c</Filename>
     <Filename>FwVol.c</Filename>
     <Filename>WinNtThunk.c</Filename>