diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
index b9d40dc03e..a4d6f2b23a 100644
--- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
+++ b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
@@ -41,10 +41,8 @@
   PrintLib
   BaseLib
 
-[FixedPcd.common]
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
   gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
 
-[Pcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
-
diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
index 074ba24519..0a51c142c4 100644
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
@@ -46,13 +46,8 @@
   PrintLib
   UefiBootServicesTableLib
 
-
-
-[FixedPcd.common]
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
   gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
 
-
-[Pcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
-
diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
index 67aeb066b6..de03bc64c6 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
@@ -44,12 +44,8 @@
   PrintLib
   UefiBootServicesTableLib
 
-
-[FixedPcd.common]
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
   gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
 
-
-[Pcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
-
diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index d5e7229062..7aa1812d0b 100644
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -70,7 +70,7 @@
   gEfiFirmwareVolume2ProtocolGuid               # ALWAYS_CONSUMED
 
 
-[FixedPcd.common]
+[Pcd.common]
   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize
 
 [FeaturePcd.common]