Index: /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc
===================================================================
--- /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc	(revision 38950)
+++ /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc	(revision 38951)
@@ -103,4 +103,6 @@
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
+  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+  #SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
 
 [LibraryClasses.common.SEC]
@@ -317,6 +319,6 @@
   PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
   PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
-  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   PcAtChipsetPkg/KbcResetDxe/Reset.inf
+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   MdeModulePkg/Universal/Metronome/Metronome.inf {
     <LibraryClasses>
Index: /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf
===================================================================
--- /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf	(revision 38950)
+++ /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf	(revision 38951)
@@ -134,6 +134,6 @@
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
 INF  PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
-INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf
+INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf
 INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
Index: /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc
===================================================================
--- /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc	(revision 38950)
+++ /trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc	(revision 38951)
@@ -90,4 +90,6 @@
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
+  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+  #SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
 
 [LibraryClasses.common.SEC]
@@ -294,6 +296,6 @@
   PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
   PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
-  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   PcAtChipsetPkg/KbcResetDxe/Reset.inf
+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   MdeModulePkg/Universal/Metronome/Metronome.inf {
     <LibraryClasses>