Index: Library/BaseSortLib/BaseSortLib.inf
===================================================================
--- Library/BaseSortLib/BaseSortLib.inf	(revision 17332)
+++ Library/BaseSortLib/BaseSortLib.inf	(working copy)
@@ -19,7 +19,7 @@
   FILE_GUID                      = 03F3331B-F12D-494f-BF37-E55A657F2497
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = SortLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER
+  LIBRARY_CLASS                  = SortLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION UEFI_DRIVER
 
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
Index: Library/UefiBootManagerLib/UefiBootManagerLib.inf
===================================================================
--- Library/UefiBootManagerLib/UefiBootManagerLib.inf	(revision 17332)
+++ Library/UefiBootManagerLib/UefiBootManagerLib.inf	(working copy)
@@ -17,7 +17,7 @@
   FILE_GUID                      = 8D4752BC-595E-49a2-B4AF-F3F57B601DE9
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = UefiBootManagerLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER
+  LIBRARY_CLASS                  = UefiBootManagerLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION UEFI_DRIVER 
 
 #
 # The following information is for reference only and not required by the build tools.