diff U3b AppPkg.dsc-revBASE.svn001.tmp.dsc AppPkg/AppPkg.dsc
--- AppPkg.dsc-revBASE.svn001.tmp.dsc Tue Nov 11 15:15:32 2014
+++ AppPkg/AppPkg.dsc Tue Jan 13 11:22:11 2015
@@ -78,11 +78,10 @@
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
-  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf

   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

diff U3b StdLib.dsc-revBASE.svn001.tmp.dsc StdLib/StdLib.dsc
--- StdLib.dsc-revBASE.svn001.tmp.dsc Tue Nov 11 14:56:58 2014
+++ StdLib/StdLib.dsc Tue Jan 13 11:26:17 2015
@@ -77,14 +77,13 @@
   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
-  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf

 ###################################################################################################
 #
diff U3b StdLib.inc-revBASE.svn001.tmp.inc StdLib/StdLib.inc
--- StdLib.inc-revBASE.svn001.tmp.inc Fri Nov 07 12:18:01 2014
+++ StdLib/StdLib.inc Tue Jan 13 11:25:49 2015
@@ -26,9 +26,8 @@

 [LibraryClasses.Common.UEFI_APPLICATION]
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
-  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

   #
diff U3b StdLib.inf-revBASE.svn001.tmp.inf StdLib/LibC/StdLib/StdLib.inf
--- StdLib.inf-revBASE.svn001.tmp.inf Fri Jul 29 16:30:44 2011
+++ StdLib/LibC/StdLib/StdLib.inf Tue Jan 13 11:26:42 2015
@@ -55,7 +55,6 @@
   LibC
   LibCType
   LibSignal
-  PathLib

 ################################################################
 #
diff U3b realpath.c-revBASE.svn001.tmp.c StdLib/LibC/StdLib/realpath.c
--- realpath.c-revBASE.svn001.tmp.c Thu Sep 11 13:42:26 2014
+++ StdLib/LibC/StdLib/realpath.c Tue Jan 13 11:31:45 2015
@@ -13,7 +13,6 @@
 #include <LibConfig.h>
 #include <Library/BaseLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/PathLib.h>
 #include <errno.h>

 /** The realpath() function shall derive, from the pathname pointed to by