diff --git a/MdePkg/Include/Protocol/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
similarity index 100%
rename from MdePkg/Include/Protocol/FileInfo.h
rename to MdePkg/Include/Guid/FileInfo.h
diff --git a/MdePkg/Include/Protocol/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
similarity index 100%
rename from MdePkg/Include/Protocol/FileSystemInfo.h
rename to MdePkg/Include/Guid/FileSystemInfo.h
diff --git a/MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
similarity index 100%
rename from MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h
rename to MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 1f2862776c..53d601bbf0 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -2375,9 +2375,6 @@ typedef enum {
 #include <Protocol/DriverDiagnostics.h>
 #include <Protocol/Ebc.h>
 #include <Protocol/EfiNetworkInterfaceIdentifier.h>
-#include <Protocol/FileInfo.h>
-#include <Protocol/FileSystemInfo.h>
-#include <Protocol/FileSystemVolumeLabelInfo.h>
 #include <Protocol/PciIo.h>
 #include <Protocol/PciRootBridgeIo.h>
 #include <Protocol/PlatformDriverOverride.h>
@@ -2397,7 +2394,9 @@ typedef enum {
 #include <Guid/PcAnsi.h>
 #include <Guid/SmBios.h>
 #include <Guid/SalSystemTable.h>
-
+#include <Guid/FileInfo.h>
+#include <Guid/FileSystemInfo.h>
+#include <Guid/FileSystemVolumeLabelInfo.h>
 
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)
 //
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 81af159af7..774fbf0b0c 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -366,6 +366,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Guid/FirmwareFileSystem.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
+    <IndustryStdHeader Name="FileInfo">
+      <IncludeHeader>Include/Guid/FileInfo.h</IncludeHeader>
+      <HelpText/>
+    </IndustryStdHeader>
+    <IndustryStdHeader Name="FileSystemInfo">
+      <IncludeHeader>Include/Guid/FileSystemInfo.h</IncludeHeader>
+      <HelpText/>
+    </IndustryStdHeader>
+    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">
+      <IncludeHeader>Include/Guid/FileSystemVolumeLabelInfo.h</IncludeHeader>
+      <HelpText/>
+    </IndustryStdHeader>
     <IndustryStdHeader Name="FrameworkDevicePath">
       <IncludeHeader>Include/Guid/FrameworkDevicePath.h</IncludeHeader>
       <HelpText/>
@@ -810,18 +822,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Protocol/EfiNetworkInterfaceIdentifier.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="FileInfo">
-      <IncludeHeader>Include/Protocol/FileInfo.h</IncludeHeader>
-      <HelpText/>
-    </IndustryStdHeader>
-    <IndustryStdHeader Name="FileSystemInfo">
-      <IncludeHeader>Include/Protocol/FileSystemInfo.h</IncludeHeader>
-      <HelpText/>
-    </IndustryStdHeader>
-    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">
-      <IncludeHeader>Include/Protocol/FileSystemVolumeLabelInfo.h</IncludeHeader>
-      <HelpText/>
-    </IndustryStdHeader>
     <IndustryStdHeader Name="FirmwareVolume">
       <IncludeHeader>Include/Protocol/FirmwareVolume.h</IncludeHeader>
       <HelpText/>