diff --git a/ShellPkg/Application/Shell/ConsoleLogger.h b/ShellPkg/Application/Shell/ConsoleLogger.h
index 847c64c8ab..f7c5f6a7a2 100644
--- a/ShellPkg/Application/Shell/ConsoleLogger.h
+++ b/ShellPkg/Application/Shell/ConsoleLogger.h
@@ -20,10 +20,10 @@
 #include <Protocol/EfiShell.h>
 #include <Protocol/EfiShellParameters.h>
 
-#include <Library/Debuglib.h>
-#include <Library/Baselib.h>
-#include <Library/BaseMemorylib.h>
-#include <Library/MemoryAllocationlib.h>
+#include <Library/DebugLib.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/HiiLib.h>
 #include <Library/ShellLib.h>
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index 479c12d351..3cf9320c11 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -52,7 +52,6 @@
 #include <Protocol/EdidOverride.h>
 #include <Protocol/LoadFile.h>
 #include <Protocol/LoadFile2.h>
-#include <Protocol/SimpleFilesystem.h>
 #include <Protocol/TapeIo.h>
 #include <Protocol/DiskIo.h>
 #include <Protocol/BlockIo.h>
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h
index bcf9bc3da4..6327ae54c5 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.h
@@ -37,7 +37,7 @@
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PcdLib.h>
-#include <library/ShellCommandLib.h>
+#include <Library/ShellCommandLib.h>
 #include <Library/PrintLib.h>
 #include <Library/ShellLib.h>
 #include <Library/HiiLib.h>
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 0533e8d4d9..0917a5ca62 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -56,7 +56,7 @@
 
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
-      DebugLib|MdePkg\Library\UefiDebugLibConOut\UefiDebugLibConOut.inf
+      DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
       NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf