diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 13de188d1c..da00472ce2 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -608,109 +608,154 @@
       <Guid>0x26f8ab01, 0xd3cd, 0x489c, 0x98, 0x4f, 0xdf, 0xde, 0xf7, 0x68, 0x39, 0x5b</Guid>
     </Entry>
   </PpiDeclarations>
-  <PcdDefinitions>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-      <Token>0x00000001</Token>
-      <DatumType>UINT32</DatumType>
-      <DefaultValue>1000000</DefaultValue>
+  <PcdDeclarations>
+    <PcdEntry>
+      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+      <Token>0x00000001</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdMaximumAsciiStringLength</C_Name>
+      <Token>0x00000002</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdMaximumLinkedListLength</C_Name>
+      <Token>0x00000003</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdSpinLockTimeout</C_Name>
+      <Token>0x00000004</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>10000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdDebugPropertyMask</C_Name>
+      <Token>0x00000005</Token>
+      <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
+      <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x0f</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdDebugPrintErrorLevel</C_Name>
+      <Token>0x00000006</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <DatumType>UINT32</DatumType>
+      <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>
+      <DefaultValue>0x80000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+      <Token>0x00000007</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x07</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdDebugClearMemoryValue</C_Name>
+      <Token>0x00000008</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0xAF</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
+      <Token>0x00000009</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>
-      <Token>0x00000002</Token>
-      <DatumType>UINT32</DatumType>
-      <DefaultValue>1000000</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumLinkedListLength</C_Name>
-      <Token>0x00000003</Token>
-      <DatumType>UINT32</DatumType>
-      <DefaultValue>1000000</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdSpinLockTimeout</C_Name>
-      <Token>0x00000004</Token>
-      <DatumType>UINT32</DatumType>
-      <DefaultValue>10000000</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <Token>0x00000005</Token>
-      <DatumType>UINT8</DatumType>
-      <DefaultValue>0x0f</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <Token>0x00000006</Token>
-      <DatumType>UINT32</DatumType>
-      <DefaultValue>0x80000000</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <Token>0x00000007</Token>
-      <DatumType>UINT8</DatumType>
-      <DefaultValue>0x07</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <Token>0x00000008</Token>
-      <DatumType>UINT8</DatumType>
-      <DefaultValue>0xAF</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <Token>0x00000008</Token>
-      <DatumType>UINT8</DatumType>
-      <DefaultValue>0xAF</DefaultValue>
-    </PcdEntry>    
-    <PcdEntry ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <Token>0x00000009</Token>
-      <DatumType>UINT8</DatumType>
-      <DefaultValue>0</DefaultValue>
-    </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdMaxPcdCallBackNumber</C_Name>
       <Token>0x0001000f</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdTestDynamicUint8</C_Name>
       <Token>0x00011000</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>0x01</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdTestDynamicUint16</C_Name>
       <Token>0x00011001</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT16</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>0x1234</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdTestDynamicUint32</C_Name>
       <Token>0x00011002</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdTestDynamicUint64</C_Name>
       <Token>0x00011003</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT64</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdTestDynamicBoolean</C_Name>
       <Token>0x00011004</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>BOOLEAN</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
       <Token>0x0001000f</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdVpdBaseAddress</C_Name>
       <Token>0x00010010</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-  </PcdDefinitions>
+  </PcdDeclarations>
 </PackageSurfaceArea>
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index cf8cb69e09..e7540b7f17 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -209,168 +209,249 @@
       <Guid>0x98c281e5, 0xf906, 0x43dd, 0xa9, 0x2b, 0xb0, 0x03, 0xbf, 0x27, 0x65, 0xda</Guid>
     </Entry>
   </PpiDeclarations>
-  <PcdDefinitions>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+  <PcdDeclarations>
+    <PcdEntry>
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>
       <Token>0x00000001</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdMaximumAsciiStringLength</C_Name>
       <Token>0x00000002</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdMaximumLinkedListLength</C_Name>
       <Token>0x00000003</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdSpinLockTimeout</C_Name>
       <Token>0x00000004</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>10000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdDebugPropertyMask</C_Name>
       <Token>0x00000005</Token>
+      <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x0f</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">
+    <PcdEntry>
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <Token>0x00000006</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>
       <DefaultValue>0x80000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <Token>0x00000007</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x07</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdDebugClearMemoryValue</C_Name>
       <Token>0x00000008</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdDebugClearMemoryValue</C_Name>
       <Token>0x00000008</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>    
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <Token>0x00000009</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
       <Token>0x00001000</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtVirtualDisk</C_Name>
       <Token>0x00001001</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtSerialPort</C_Name>
       <Token>0x00001002</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"COM1!COM2"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtUga</C_Name>
       <Token>0x00001003</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtFileSystem</C_Name>
       <Token>0x00001004</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtMemorySize</C_Name>
       <Token>0x00001005</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"64!64"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
       <Token>0x00001005</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"64!64"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdWinNtBootMode</C_Name>
       <Token>0x00001006</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtCpuModel</C_Name>
       <Token>0x00001007</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtCpuSpeed</C_Name>
       <Token>0x00001008</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"3000"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdWinNtFirmwareVolume</C_Name>
       <Token>0x00001009</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtConsole</C_Name>
       <Token>0x0000100a</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>VOID*</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdRothmanTest</C_Name>
       <Token>0x0000100b</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">
+    <PcdEntry>
       <C_Name>PcdWinNtBinaryPatch1</C_Name>
       <Token>0x0001000b</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x1234</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">
+    <PcdEntry>
       <C_Name>PcdWinNtBinaryPatch2</C_Name>
       <Token>0x0001000c</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x5678</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FEATURE_FLAG">
+    <PcdEntry>
       <C_Name>PcdWinNtFeatureFlag1</C_Name>
       <Token>0x0001000d</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>BOOLEAN</DatumType>
+      <ValidUsage>FEATURE_FLAG</ValidUsage>
       <DefaultValue>0x1</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="DYNAMIC">
+    <PcdEntry>
       <C_Name>PcdWinNtDynamicUINT32</C_Name>
       <Token>0x0001000e</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-  </PcdDefinitions>
+  </PcdDeclarations>
 </PackageSurfaceArea>
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 1978f7b492..e2756b8ac9 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1181,66 +1181,96 @@
       <Guid>0x1f4c6f90, 0xb06b, 0x48d8, 0xa2, 0x01, 0xba, 0xe5, 0xf1, 0xcd, 0x7d, 0x56</Guid>
     </Entry>
   </PpiDeclarations>
-  <PcdDefinitions>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+  <PcdDeclarations>
+    <PcdEntry>
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>
       <Token>0x00000001</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdMaximumAsciiStringLength</C_Name>
       <Token>0x00000002</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdMaximumLinkedListLength</C_Name>
       <Token>0x00000003</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdSpinLockTimeout</C_Name>
       <Token>0x00000004</Token>
+      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>10000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdDebugPropertyMask</C_Name>
       <Token>0x00000005</Token>
+      <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
-      <DefaultValue>0</DefaultValue>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x0f</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">
+    <PcdEntry>
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <Token>0x00000006</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT32</DatumType>
+      <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>
       <DefaultValue>0x80000000</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <Token>0x00000007</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
-      <DefaultValue>0</DefaultValue>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x07</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdDebugClearMemoryValue</C_Name>
       <Token>0x00000008</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <Token>0x00000009</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
-      <DefaultValue>0x0</DefaultValue>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-    <PcdEntry ItemType="FIXED_AT_BUILD">
+    <PcdEntry>
       <C_Name>PcdPostCodePropertyMask</C_Name>
       <Token>0x0000000b</Token>
+      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
       <DatumType>UINT8</DatumType>
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
+      <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
-  </PcdDefinitions>
+  </PcdDeclarations>
 </PackageSurfaceArea>