diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index f3ad22f339..988fb50440 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -369,6 +369,49 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0
 
+[Libraries.IA32]
+  #
+  # Libraries common to PEI and DXE
+  #
+  EdkCompatibilityPkg\Foundation\Efi\Guid\EfiGuidLib.inf
+  EdkCompatibilityPkg\Foundation\Framework\Guid\EdkFrameworkGuidLib.inf
+  EdkCompatibilityPkg\Foundation\Guid\EdkGuidLib.inf
+  EdkCompatibilityPkg\Foundation\Library\EfiCommonLib\EfiCommonLib.inf
+  EdkCompatibilityPkg\Foundation\Cpu\Pentium\CpuIA32Lib\CpuIA32Lib.inf
+  EdkCompatibilityPkg\Foundation\Cpu\Itanium\CpuIA64Lib\CpuIA64Lib.inf
+  EdkCompatibilityPkg\Foundation\Library\CustomizedDecompress\CustomizedDecompress.inf
+  EdkCompatibilityPkg\Foundation\Library\CompilerStub\CompilerStubLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\Hob\HobLib.inf
+
+  #
+  # PEI libraries
+  #
+  EdkCompatibilityPkg\Foundation\Framework\Ppi\EdkFrameworkPpiLib.inf
+  EdkCompatibilityPkg\Foundation\Ppi\EdkPpiLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Pei\PeiLib\PeiLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Pei\Hob\PeiHobLib.inf
+
+  #
+  # DXE libraries
+  #
+  EdkCompatibilityPkg\Foundation\Core\Dxe\ArchProtocol\ArchProtocolLib.inf
+  EdkCompatibilityPkg\Foundation\Efi\Protocol\EfiProtocolLib.inf
+  EdkCompatibilityPkg\Foundation\Framework\Protocol\EdkFrameworkProtocolLib.inf
+  EdkCompatibilityPkg\Foundation\Protocol\EdkProtocolLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiDriverLib\EfiDriverLib.inf
+  EdkCompatibilityPkg\Foundation\Library\RuntimeDxe\EfiRuntimeLib\EfiRuntimeLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\Graphics\Graphics.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiIfrSupportLib\EfiIfrSupportLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\Print\PrintLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiScriptLib\EfiScriptLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\EfiUiLib\EfiUiLib.inf
+
+  #
+  # Print/Graphics Library consume SetupBrowser Print Protocol
+  #
+  EdkCompatibilityPkg\Foundation\Library\Dxe\PrintLite\PrintLib.inf
+  EdkCompatibilityPkg\Foundation\Library\Dxe\GraphicsLite\Graphics.inf
+
 ################################################################################
 #
 # Components Section - list of all EDK II Modules needed by this Platform
@@ -468,17 +511,5 @@
   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
 
 [BuildOptions]
-  DEBUG_ICC_IA32_DLINK_FLAGS                  = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  DEBUG_VS2003_IA32_DLINK_FLAGS               = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  DEBUG_MYTOOLS_IA32_DLINK_FLAGS              = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS      = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  DEBUG_VS2005PRO_IA32_DLINK_FLAGS            = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  DEBUG_MIXED_IA32_DLINK_FLAGS                = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  RELEASE_ICC_IA32_DLINK_FLAGS                = /ALIGN:4096
-  RELEASE_VS2003_IA32_DLINK_FLAGS             = /ALIGN:4096
-  RELEASE_MYTOOLS_IA32_DLINK_FLAGS            = /ALIGN:4096
-  RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS    = /ALIGN:4096
-  RELEASE_VS2005PRO_IA32_DLINK_FLAGS          = /ALIGN:4096
-  RELEASE_MIXED_IA32_DLINK_FLAGS              = /ALIGN:4096
-  MSFT:DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=_ModuleEntryPoint /ALIGN:4096 /SUBSYSTEM:CONSOLE
-  MSFT:RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096
+  DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /ALIGN:4096 /SUBSYSTEM:CONSOLE
+  RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096