diff U3b ArmVExpress.dsc.inc-revBASE.svn001.tmp.inc ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
--- ArmVExpress.dsc.inc-revBASE.svn001.tmp.inc  Tue Jan 06 07:41:59 2015
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc Tue Jan 13 11:52:42 2015
@@ -119,8 +119,8 @@
   # It uses the Shell libraries.
   ArmShellCmdRunAxfLib|ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

 [LibraryClasses.common.SEC]
   ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
diff U3b BootMonFs.inf-revBASE.svn001.tmp.inf ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf
--- BootMonFs.inf-revBASE.svn001.tmp.inf  Mon Dec 15 03:13:44 2014
+++ ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf Tue Jan 13 11:37:58 2015
@@ -38,7 +38,7 @@

 [LibraryClasses]
   BaseLib
-  BasePathLib
+#  BasePathLib
   DevicePathLib
   MemoryAllocationLib
   PrintLib
diff U3b BootMonFsOpenClose.c-revBASE.svn001.tmp.c ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c
--- BootMonFsOpenClose.c-revBASE.svn001.tmp.c Fri Dec 12 11:06:10 2014
+++ ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c  Tue Jan 13 11:35:32 2015
@@ -12,7 +12,7 @@
 *
 **/

-#include <Library/PathLib.h>
+#include <Library/BaseLib.h>
 #include "BootMonFsInternal.h"

 // Clear a file's image description on storage media: