3 files changed, 6 insertions, 7 deletions
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
index c77f09b976..f9e28861c5 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
@@ -31,11 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>UefiBootServicesTableLib</Library>
     <Library>UefiRuntimeServicesTableLib</Library>
     <Library>BaseLib</Library>
-    <Library>BaseMemoryLib</Library>
+    <Library>UefiMemoryLib</Library>
     <Library>UefiLib</Library>
     <Library>UefiDriverEntryPoint</Library>
     <Library>DxeReportStatusCodeLib</Library>
-    <Library>BaseDebugLibNull</Library>
+    <Library>BaseDebugLibReportStatusCode</Library>
     <Library>BasePrintLib</Library>
     <Library>EdkGraphicsLib</Library>
     <Library>EdkIfrSupportLib</Library>
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
index 6a3eec14b1..6dc2e36138 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
@@ -31,13 +31,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>UefiBootServicesTableLib</Library>
     <Library>UefiRuntimeServicesTableLib</Library>
     <Library>BaseLib</Library>
-    <Library>BaseDebugLibNull</Library>    
-    <Library>BaseMemoryLib</Library>
+    <Library>DxeReportStatusCodeLib</Library>
+    <Library>BaseDebugLibReportStatusCode</Library>
+    <Library>UefiMemoryLib</Library>
     <Library>BasePrintLib</Library>
     <Library>UefiDriverEntryPoint</Library>
     <Library>DxeMemoryAllocationLib</Library>
     <Library>EdkGraphicsLib</Library>
-    <Library>DxeReportStatusCodeLib</Library>
     <Library>HiiLib</Library>
   </Libraries>
 </ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
index 6a5be9d885..7f2ea440e8 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
@@ -35,8 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>UefiDriverEntryPoint</Library>
     <Library>DxeReportStatusCodeLib</Library>
     <Library>DxeServicesTableLib</Library>
-    <Library>BaseDebugLibNull</Library>
-    <Library>BasePrintLib</Library>
+    <Library>BaseDebugLibReportStatusCode</Library>
     <Library>EdkDxeRuntimeDriverLib</Library>
     <Library>DxeHobLib</Library>
     <Library>DxeMemoryAllocationLib</Library>