diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index 9a33d33710..a6ca747aa9 100644
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -27,194 +27,194 @@
   SmmLib|Include/Library/SmmLib.h
 
 [Guids.common]
-	## EdkCompatibilityPkg/Foundation/Framework/Guid/AcpiTableStorage/AcpiTableStorage.h
+  ## EdkCompatibilityPkg/Foundation/Framework/Guid/AcpiTableStorage/AcpiTableStorage.h
   gEfiAcpiTableStorageGuid       = { 0x7e374e25, 0x8e01, 0x4fee, { 0x87, 0xf2, 0x39, 0x0c, 0x23, 0xc6, 0x06, 0xcd }}
-	
-	## Include/Guid/DataHubRecords.h
+  
+  ## Include/Guid/DataHubRecords.h
   gEfiCacheSubClassGuid          = { 0x7f0013a7, 0xdc79, 0x4b22, { 0x80, 0x99, 0x11, 0xf7, 0x5f, 0xdc, 0x82, 0x9d }}
-	
-	## Include/Guid/DataHubRecords.h
+  
+  ## Include/Guid/DataHubRecords.h
   gEfiMemorySubClassGuid         = { 0x4E8F4EBB, 0x64B9, 0x4e05, { 0x9b, 0x18, 0x4c, 0xfe, 0x49, 0x23, 0x50, 0x97 }}
-	
-	## Include/Guid/DataHubRecords.h
+  
+  ## Include/Guid/DataHubRecords.h
   gEfiMiscSubClassGuid           = { 0x772484B2, 0x7482, 0x4b91, { 0x9f, 0x9a, 0xad, 0x43, 0xf8, 0x1c, 0x58, 0x81 }}
-	
-	## Include/Guid/DataHubRecords.h
+  
+  ## Include/Guid/DataHubRecords.h
   gEfiProcessorSubClassGuid      = { 0x26fdeb7e, 0xb8af, 0x4ccf, { 0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 }}
-	
-	## Include/Guid/Capsule.h
+  
+  ## Include/Guid/Capsule.h
   gEfiCapsuleGuid                = { 0x3B6686BD, 0x0D76, 0x4030, { 0xB7, 0x0E, 0xB5, 0x51, 0x9E, 0x2F, 0xC5, 0xA0 }}
-	
-	## Include/Guid/Capsule.h
+  
+  ## Include/Guid/Capsule.h
   gEfiConfigFileNameGuid         = { 0x98B8D59B, 0xE8BA, 0x48EE, { 0x98, 0xDD, 0xC2, 0x95, 0x39, 0x2F, 0x1E, 0xDB }}
-	
-	## Include/Guid/SmramMemoryReserve.h
+  
+  ## Include/Guid/SmramMemoryReserve.h
   gEfiSmmPeiSmramMemoryReserveGuid = { 0x6dadf1d1, 0xd4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d }}
-	
-	## Include/Guid/SmmCommunicate.h
+  
+  ## Include/Guid/SmmCommunicate.h
   gSmmCommunicateHeaderGuid      = { 0xf328e36c, 0x23b6, 0x4a95, { 0x85, 0x4b, 0x32, 0xe1, 0x95, 0x34, 0xcd, 0x75 }}
-	
-	## Include/Guid/FrameworkDevicePath.h
+  
+  ## Include/Guid/FrameworkDevicePath.h
   gEfiFrameworkDevicePathGuid    = { 0xb7084e63, 0x46b7, 0x4d1a, { 0x86, 0x77, 0xe3, 0x0b, 0x53, 0xdb, 0xf0, 0x50 }}
 
-	## Include/Guid/StatusCodeDataTypeId.h
+  ## Include/Guid/StatusCodeDataTypeId.h
   gEfiStatusCodeDataTypeStringGuid = { 0x92D11080, 0x496F, 0x4D95, { 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A }}
   
   ## Include/Guid/StatusCodeDataTypeId.h
   gEfiStatusCodeSpecificDataGuid   = { 0x335984BD, 0xE805, 0x409A, { 0xB8, 0xF8, 0xD2, 0x7E, 0xCE, 0x5F, 0xF7, 0xA6 }}
 
-	## IntelFrameworkModulePkg/Include/Guid/DataHubProducer.h
+  ## IntelFrameworkModulePkg/Include/Guid/DataHubProducer.h
   gEfiMiscProducerGuid           = { 0x62512c92, 0x63c4, 0x4d80, { 0x82, 0xb1, 0xc1, 0xa4, 0xdc, 0x44, 0x80, 0xe5 }}
-	
-	## IntelFrameworkModulePkg/Include/Guid/DataHubProducer.h
+  
+  ## IntelFrameworkModulePkg/Include/Guid/DataHubProducer.h
   gEfiMemoryProducerGuid         = { 0x1d7add6e, 0xb2da, 0x4b0b, { 0xb2, 0x9f, 0x49, 0xcb, 0x42, 0xf4, 0x63, 0x56 }}
-	
-	## IntelFrameworkModulePkg/Include/Guid/DataHubProducer.h
+  
+  ## IntelFrameworkModulePkg/Include/Guid/DataHubProducer.h
   gEfiProcessorProducerGuid      = { 0x1bf06aea, 0x5bec, 0x4a8d, { 0x95, 0x76, 0x74, 0x9b, 0x09, 0x56, 0x2d, 0x30 }}
-	
-	## Include/Guid/FirmwareFileSystem.h
+  
+  ## Include/Guid/FirmwareFileSystem.h
   gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}
 
 [Protocols.common]
-	## Include/Protocol/AcpiS3Save.h
+  ## Include/Protocol/AcpiS3Save.h
   gEfiAcpiS3SaveProtocolGuid     = { 0x125F2DE1, 0xFB85, 0x440C, { 0xA5, 0x4C, 0x4D, 0x99, 0x35, 0x8A, 0x8D, 0x38 }}
-	
-	## Include/Protocol/AcpiSupport.h
+  
+  ## Include/Protocol/AcpiSupport.h
   gEfiAcpiSupportProtocolGuid    = { 0xdbff9d55, 0x89b7, 0x46da, { 0xbd, 0xdf, 0x67, 0x7d, 0x3d, 0xc0, 0x24, 0x1d }}
-	
-	## Include/Protocol/BootScriptSave.h
+  
+  ## Include/Protocol/BootScriptSave.h
   gEfiBootScriptSaveProtocolGuid = { 0x470e1529, 0xb79e, 0x4e32, { 0xa0, 0xfe, 0x6a, 0x15, 0x6d, 0x29, 0xf9, 0xb2 }}
-	
-	## Include/Protocol/LegacyBios.h
+  
+  ## Include/Protocol/LegacyBios.h
   gEfiLegacyBiosProtocolGuid     = { 0xdb9a1e3d, 0x45cb, 0x4abb, { 0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d }}
-	
-	## Include/Protocol/LegacyBiosPlatform.h
+  
+  ## Include/Protocol/LegacyBiosPlatform.h
   gEfiLegacyBiosPlatformProtocolGuid = { 0x783658a3, 0x4172, 0x4421, { 0xa2, 0x99, 0xe0, 0x09, 0x07, 0x9c, 0x0c, 0xb4 }}
-	
-	## Include/Protocol/LegacyInterrupt.h
+  
+  ## Include/Protocol/LegacyInterrupt.h
   gEfiLegacyInterruptProtocolGuid = { 0x31ce593d, 0x108a, 0x485d, { 0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe }}
-	
-	## Include/Protocol/LegacyRegion.h
+  
+  ## Include/Protocol/LegacyRegion.h
   gEfiLegacyRegionProtocolGuid   = { 0x0fc9013a, 0x0568, 0x4ba9, { 0x9b, 0x7e, 0xc9, 0xc3, 0x90, 0xa6, 0x60, 0x9b }}
-	
-	## Include/Protocol/Legacy8259.h
+  
+  ## Include/Protocol/Legacy8259.h
   gEfiLegacy8259ProtocolGuid     = { 0x38321dba, 0x4fe0, 0x4e17, { 0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1 }}
-	
-	## Include\Protocol\CpuIo.h
+  
+  ## Include\Protocol\CpuIo.h
   gEfiCpuIoProtocolGuid          = { 0xB0732526, 0x38C8, 0x4b40, { 0x88, 0x77, 0x61, 0xc7, 0xb0, 0x6a, 0xac, 0x45 }}
   
   ## Include/Protocol/CpuIo.h
   gEfiDataHubProtocolGuid        = { 0xae80d021, 0x618e, 0x11d4, { 0xbc, 0xd7, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81 }}
-	
-	## Include/Protocol/FirmwareVolume.h
+  
+  ## Include/Protocol/FirmwareVolume.h
   gEfiFirmwareVolumeProtocolGuid = { 0x389F751F, 0x1838, 0x4388, { 0x83, 0x90, 0xcd, 0x81, 0x54, 0xbd, 0x27, 0xf8 }}
-	
-	## Include/Protocol/SectionExtraction.h
+  
+  ## Include/Protocol/SectionExtraction.h
   gEfiSectionExtractionProtocolGuid = { 0x448F5DA4, 0x6DD7, 0x4FE1, { 0x93, 0x07, 0x69, 0x22, 0x41, 0x92, 0x21, 0x5D }}
-	
-	## Include/Protocol/PciHotPlugInit.h
+  
+  ## Include/Protocol/PciHotPlugInit.h
   gEfiPciHotPlugInitProtocolGuid = { 0xaa0e8bc1, 0xdabc, 0x46b0, { 0xa8, 0x44, 0x37, 0xb8, 0x16, 0x9b, 0x2b, 0xea }}
-	
-	## Include/Protocol/FrameworkHii.h
+  
+  ## Include/Protocol/FrameworkHii.h
   gEfiHiiProtocolGuid            = { 0xd7ad636e, 0xb997, 0x459b, { 0xbf, 0x3f, 0x88, 0x46, 0x89, 0x79, 0x80, 0xe1 }}
-	
-	## Include/Protocol/FrameworkHii.h 
+  
+  ## Include/Protocol/FrameworkHii.h 
   gEfiHiiCompatibilityProtocolGuid = { 0x5542cce1, 0xdf5c, 0x4d1b, { 0xab, 0xca, 0x36, 0x4f, 0x77, 0xd3, 0x99, 0xfb }}
-	
-	## Include/Protocol/IdeControllerInit.h
+  
+  ## Include/Protocol/IdeControllerInit.h
   gEfiIdeControllerInitProtocolGuid = { 0xa1e37052, 0x80d9, 0x4e65, { 0xa3, 0x17, 0x3e, 0x9a, 0x55, 0xc4, 0x3e, 0xc9 }}
-	
-	## Include/Protocol/PciHostBridgeResourceAllocation.h
+  
+  ## Include/Protocol/PciHostBridgeResourceAllocation.h
   gEfiPciHostBridgeResourceAllocationProtocolGuid = { 0xCF8034BE, 0x6768, 0x4d8b, { 0xb7, 0x39, 0x7c, 0xce, 0x68, 0x3a, 0x9f, 0xbe }}
-	
-	## Include/Protocol/PciPlatform.h
+  
+  ## Include/Protocol/PciPlatform.h
   gEfiPciPlatformProtocolGuid    = { 0x07d75280, 0x27d4, 0x4d69, { 0x90, 0xd0, 0x56, 0x43, 0xe2, 0x38, 0xb3, 0x41 }}
-	
-	## Include/Protocol/IncompatiblePciDeviceSupport.h
+  
+  ## Include/Protocol/IncompatiblePciDeviceSupport.h
   gEfiIncompatiblePciDeviceSupportProtocolGuid = { 0xeb23f55a, 0x7863, 0x4ac2, { 0x8d, 0x3d, 0x95, 0x65, 0x35, 0xde, 0x03, 0x75 }}
-	
-	## Include/Protocol/SmmBase.h
+  
+  ## Include/Protocol/SmmBase.h
   gEfiSmmBaseProtocolGuid        = { 0x1390954D, 0xda95, 0x4227, { 0x93, 0x28, 0x72, 0x82, 0xc2, 0x17, 0xda, 0xa8 }}
-	
-	## Include/Protocol/SmmAccess.h
+  
+  ## Include/Protocol/SmmAccess.h
   gEfiSmmAccessProtocolGuid      = { 0x3792095a, 0xe309, 0x4c1e, { 0xaa, 0x01, 0x85, 0xf5, 0x65, 0x5a, 0x17, 0xf1 }}
-	
-	## Include/Protocol/SmmControl.h
+  
+  ## Include/Protocol/SmmControl.h
   gEfiSmmControlProtocolGuid     = { 0x8d12e231, 0xc667, 0x4fd1, { 0x98, 0xf2, 0x24, 0x49, 0xa7, 0xe7, 0xb2, 0xe5 }}
-	
-	## Include/Protocol/SmmSwDispatch.h
+  
+  ## Include/Protocol/SmmSwDispatch.h
   gEfiSmmSwDispatchProtocolGuid  = { 0xe541b773, 0xdd11, 0x420c, { 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf }}
-	
-	## Include/Protocol/SmmSxDispatch.h
+  
+  ## Include/Protocol/SmmSxDispatch.h
   gEfiSmmSxDispatchProtocolGuid  = { 0x14fc52be, 0x01dc, 0x426c, { 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8 }}
-	
-	## Include/Protocol/SmmPeriodicTimerDispatch.h
+  
+  ## Include/Protocol/SmmPeriodicTimerDispatch.h
   gEfiSmmPeriodicTimerDispatchProtocolGuid = { 0x9cca03fc, 0x4c9e, 0x4a19, { 0x9b, 0x06, 0xed, 0x7b, 0x47, 0x9b, 0xde, 0x55 }}
-	
-	## Include/Protocol/SmmUsbDispatch.h
+  
+  ## Include/Protocol/SmmUsbDispatch.h
   gEfiSmmUsbDispatchProtocolGuid = { 0xa05b6ffd, 0x87af, 0x4e42, { 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3 }}
-	
-	## Include/Protocol/SmmGpiDispatch.h
+  
+  ## Include/Protocol/SmmGpiDispatch.h
   gEfiSmmGpiDispatchProtocolGuid = { 0xe0744b81, 0x9513, 0x49cd, { 0x8c, 0xea, 0xe9, 0x24, 0x5e, 0x70, 0x39, 0xda }}
-	
-	## Include/Protocol/SmmStandbyButtonDispatch.h
+  
+  ## Include/Protocol/SmmStandbyButtonDispatch.h
   gEfiSmmStandbyButtonDispatchProtocolGuid = { 0x78965b98, 0xb0bf, 0x449e, { 0x8b, 0x22, 0xd2, 0x91, 0x4e, 0x49, 0x8a, 0x98 }}
-	
-	## Include/Protocol/SmmPowerButtonDispatch.h
+  
+  ## Include/Protocol/SmmPowerButtonDispatch.h
   gEfiSmmPowerButtonDispatchProtocolGuid = { 0xb709efa0, 0x47a6, 0x4b41, { 0xb9, 0x31, 0x12, 0xec, 0xe7, 0xa8, 0xee, 0x56 }}
-	
-	## Include/Protocol/SmmIchnDispatch.h
+  
+  ## Include/Protocol/SmmIchnDispatch.h
   gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc }}
-	
-	## Include/Protocol/FrameworkFormCallback.h
+  
+  ## Include/Protocol/FrameworkFormCallback.h
   gEfiFormCallbackProtocolGuid   = { 0xF3E4543D, 0xCF35, 0x6CEF, { 0x35, 0xC4, 0x4F, 0xE6, 0x34, 0x4D, 0xFC, 0x54 }}
-	
-	## Include/Protocol/FrameworkFormBrowser.h
+  
+  ## Include/Protocol/FrameworkFormBrowser.h
   gEfiFormBrowserProtocolGuid    = { 0xE5A1333E, 0xE1B4, 0x4D55, { 0xCE, 0xEB, 0x35, 0xC3, 0xEF, 0x13, 0x34, 0x43 }}
-	
-	## Include/Protocol/FrameworkFormBrowser.h
+  
+  ## Include/Protocol/FrameworkFormBrowser.h
   gEfiFormBrowserCompatibilityProtocolGuid    = { 0xfb7c852, 0xadca, 0x4853, { 0x8d, 0xf, 0xfb, 0xa7, 0x1b, 0x1c, 0xe1, 0x1a }}
 
 [Ppis.common]
-	## Include/Ppi/BootScriptExecuter.h
+  ## Include/Ppi/BootScriptExecuter.h
   gEfiPeiBootScriptExecuterPpiGuid = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}
-	
-	## Include/Ppi/RecoveryModule.h
+  
+  ## Include/Ppi/RecoveryModule.h
   gEfiPeiRecoveryModulePpiGuid   = { 0xFB6D9542, 0x612D, 0x4f45, { 0x87, 0x2f, 0x5c, 0xff, 0x52, 0xe9, 0x3d, 0xcf }}
-	
-	## Include/Ppi/DeviceRecoveryModule.h
+  
+  ## Include/Ppi/DeviceRecoveryModule.h
   gEfiPeiDeviceRecoveryModulePpiGuid = {0x0DE2CE25, 0x446A, 0x45a7, {0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37 }}
-	
-	## Include/Ppi/BlockIo.h
+  
+  ## Include/Ppi/BlockIo.h
   gEfiPeiVirtualBlockIoPpiGuid   = { 0x695d8aa1, 0x42ee, 0x4c46, { 0x80, 0x5c, 0x6e, 0xa6, 0xbc, 0xe7, 0x99, 0xe3 }}
-	
-	##  Include/Ppi/BlockIo.h
+  
+  ##  Include/Ppi/BlockIo.h
   gEfiPei144FloppyBlockIoPpiGuid = { 0xda6855bd, 0x07b7, 0x4c05, { 0x9e, 0xd8, 0xe2, 0x59, 0xfd, 0x36, 0x0e, 0x22 }}
-	
-	##   Include/Ppi/BlockIo.h
+  
+  ##   Include/Ppi/BlockIo.h
   gEfiPeiIdeBlockIoPpiGuid       = { 0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
-	
-	## Include/Ppi/S3Resume.h
+  
+  ## Include/Ppi/S3Resume.h
   gEfiPeiS3ResumePpiGuid         = { 0x4426CCB2, 0xE684, 0x4a8a, { 0xae, 0x40, 0x20, 0xd4, 0xb0, 0x25, 0xb7, 0x10 }}
-	
-	## Include/Ppi/Security.h
+  
+  ## Include/Ppi/Security.h
   gEfiPeiSecurityPpiGuid         = { 0x1388066E, 0x3A57, 0x4EFA, { 0x98, 0xF3, 0xC1, 0x2F, 0x3A, 0x95, 0x8A, 0x29 }}
-	
-	## Include/Ppi/Smbus.h
+  
+  ## Include/Ppi/Smbus.h
   gEfiPeiSmbusPpiGuid            = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xda }}
 
-	## Include/Ppi/PciCfg.h
+  ## Include/Ppi/PciCfg.h
   gEfiPciCfgPpiInServiceTableGuid = { 0xe1f2eba0, 0xf7b9, 0x4a26, {0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90 }}
-	
-	## Include/Ppi/ReadOnlyVariable.h
+  
+  ## Include/Ppi/ReadOnlyVariable.h
   gEfiPeiReadOnlyVariablePpiGuid = { 0x3CDC90C6, 0x13FB, 0x4A75, { 0x9E, 0x79, 0x59, 0xE9, 0xDD, 0x78, 0xB9, 0xFA }}
-	
-	## Include/Ppi/SectionExtraction.h
+  
+  ## Include/Ppi/SectionExtraction.h
   gEfiPeiSectionExtractionPpiGuid = { 0x4F89E208, 0xE144, 0x4804, { 0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 }}
-	
-	## Include/Ppi/FvLoadFile.h
+  
+  ## Include/Ppi/FvLoadFile.h
   gEfiPeiFvFileLoaderPpiGuid     = { 0x7e1f0d85, 0x4ff, 0x4bb2, {0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 }}
-	
-	## Include/Ppi/FindFv.h
+  
+  ## Include/Ppi/FindFv.h
   gEfiFindFvPpiGuid              = { 0x36164812, 0xa023, 0x44e5, { 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa }}