diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib_Edk2.inf b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib_Edk2.inf
new file mode 100644
index 0000000000..da93a1c28d
--- /dev/null
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib_Edk2.inf
@@ -0,0 +1,110 @@
+#/*++
+#
+# 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.             
+# 
+#  Module Name:
+#
+#    PeiLib.inf
+#
+#  Abstract:
+#
+#    Component description file for the PEI library.
+#
+#--*/
+
+[defines]
+BASE_NAME         = PeiLib
+COMPONENT_TYPE    = LIBRARY
+
+[sources.common]
+  PeiLib.c
+  PeCoffLoader.c
+  Decompress.c
+  Debug.c
+  Hob/Hob.c
+  Perf.c
+  Print/Print.c
+  Print/Print.h
+  FindFv.c
+
+[sources.ia32]
+#  ia32/Math.c
+  ia32/PeCoffLoaderEx.c
+  ia32/PeCoffLoaderEx.h
+  ia32/PerformancePrimitives.c
+  ia32/Processor.c
+  ia32/ProcessorAsms.Asm         |MSFT
+  ia32/ProcessorAsms.Asm         |INTEL
+  ia32/SupportItpDebug.asm       |MSFT
+  ia32/SupportItpDebug.asm       |INTEL
+  ia32/EfiJump.h
+  ia32/ReadIdt.asm               |MSFT
+  ia32/ReadIdt.asm               |INTEL
+  ia32/WriteIdt.asm              |MSFT
+  ia32/WriteIdt.asm              |INTEL
+  ia32/PeiServicePointer.c
+
+[sources.x64]
+  x64/PeCoffLoaderEx.c
+  x64/PeCoffLoaderEx.h
+  x64/PerformancePrimitives.c
+  x64/Processor.c
+  x64/ProcessorAsms.Asm          |MSFT
+  x64/ProcessorAsms.Asm          |INTEL
+  x64/SupportItpDebug.asm        |MSFT
+  x64/SupportItpDebug.asm        |INTEL
+  x64/EfiJump.h
+  x64/PeiServicePointer.c
+
+[sources.ipf]
+#  Ipf/Math.c
+  Ipf/PeCoffLoaderEx.c
+  Ipf/PeCoffLoaderEx.h
+  Ipf/PerformancePrimitives.s
+  Ipf/Processor.c
+  Ipf/EfiJump.h
+  Ipf/SetJmp.s
+  Ipf/Asm.h
+  Ipf/PioFlush.s
+  Ipf/SwitchStack.s
+  Ipf/Ia_64Gen.h
+  Ipf/HwAccess.s
+  Ipf/PeiServicePointer.c
+  
+  
+[libraries.common]
+  EdkGuidLib
+  EfiCommonLib
+
+[libraries.ia32]
+  CpuIA32Lib
+
+[libraries.x64]
+  CpuIA32Lib
+
+[includes.common]
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
+  .
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Include/Pei
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+  $(EDK_SOURCE)/Foundation/Cpu/Pentium/Include
+
+[includes.ia32.Nt32]
+  $(EDK_SOURCE)/Sample/Platform/Nt32
+
+[nmake.common]
diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf
new file mode 100644
index 0000000000..40e3867f7b
--- /dev/null
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf
@@ -0,0 +1,81 @@
+#/*++
+#
+# Copyright (c) 2004 - 2007, 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:
+#
+#    EfiRuntimeLib.inf
+#
+#  Abstract:
+#
+#    Component description file for the EFI runtime library.
+#
+#--*/
+
+[defines]
+BASE_NAME       = EfiRuntimeLib
+COMPONENT_TYPE  = LIBRARY
+
+[sources.common]
+  Debug.c
+  Event.c
+  Io.c
+  LibGlobals.c
+  GetImage.c
+  RtDevicePath.c
+
+[sources.ia32]
+  ia32/RuntimeLib.c
+  ia32/IoLib.c
+  ia32/Lock.c
+  ia32/PlatformIoLib.c
+  ia32/Fvb.c
+
+[sources.x64]
+  x64/RuntimeLib.c
+  x64/IoLib.c
+  x64/Lock.c
+  x64/PlatformIoLib.c
+  x64/Fvb.c
+  x64/RuntimeLibAsm.asm     | MSFT
+  x64/RuntimeLibAsm.asm     | INTEL
+
+[sources.ipf]
+  Ipf/RuntimeLib.c
+  Ipf/Lock.c
+  Ipf/Fvb.c
+  Ipf/EsalLib.s
+  Ipf/IpfCpuCache.s
+
+[sources.ebc]
+  Ebc/RuntimeLib.c
+
+[includes.common]
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Core/Dxe
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+
+[libraries.common]
+  EdkGuidLib
+  EdkProtocolLib
+  EdkFrameworkProtocolLib
+  EfiGuidLib
+  EfiProtocolLib
+  ArchProtocolLib
+  EfiCommonLib
+
+[nmake.common]
+
diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib_Edk2.inf b/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib_Edk2.inf
new file mode 100644
index 0000000000..01581171df
--- /dev/null
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib_Edk2.inf
@@ -0,0 +1,53 @@
+#/*++
+#
+#  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:
+#
+#     Thunk16Lib.inf
+#
+#   Abstract:
+#
+#--*/
+
+[defines]
+BASE_NAME            = Thunk16Lib
+COMPONENT_TYPE       = LIBRARY
+
+[sources.common]
+  x86Thunk.c
+
+[sources.ia32]
+  Ia32/Thunk16.asm  | MSFT
+  Ia32/Thunk16.asm  | INTEL 
+  Ia32/Fx.asm       | MSFT
+  Ia32/Fx.asm       | INTEL
+
+[sources.x64]
+  X64/Thunk16.asm   | MSFT
+  X64/Thunk16.asm   | INTEL
+  X64/Fx.asm        | MSFT
+  X64/Fx.asm        | INTEL
+
+[includes.common]
+  .
+  $(EDK_SOURCE)/Foundation/Framework
+  $(EDK_SOURCE)/Foundation/Efi
+  $(EDK_SOURCE)/Foundation
+  $(EDK_SOURCE)/Foundation/Include
+  $(EDK_SOURCE)/Foundation/Efi/Include
+  $(EDK_SOURCE)/Foundation/Framework/Include
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include
+
+[libraries.common]
+
+
+[nmake.common]