diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index ffa4b0f69c..d0c7a56ee2 100644
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -85,6 +85,12 @@
   LibSignal|StdLib/LibC/Signal/Signal.inf
   LibNetUtil|StdLib/LibC/NetUtil/NetUtil.inf
 
+  # Libraries for device abstractions within the Standard C Library
+  # Applications should not directly access any functions defined in these libraries.
+  DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf
+  DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf
+  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf
+
 [LibraryClasses.IA32]
   TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf
   ## Comment out the above line and un-comment the line below for running under Nt32 emulation.
diff --git a/AppPkg/Applications/Main/Main.inf b/AppPkg/Applications/Main/Main.inf
index 750cf55d55..434c14593b 100644
--- a/AppPkg/Applications/Main/Main.inf
+++ b/AppPkg/Applications/Main/Main.inf
@@ -35,8 +35,8 @@
 [LibraryClasses]
   LibC
   LibStdio
-#  UefiLib
-#  ShellCEntryLib
+  DevShell
+
 
 [BuildOptions]
   MSFT:*_*_IA32_CC_FLAGS  = /Oi-