[coreboot-gerrit] New patch to review for coreboot: f1cf254 AGESA: Remove totally useless ASCII-art

Mon Jan 12 21:53:36 CET 2015

Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8204

-gerrit

commit f1cf2543f3da9ecbc5594ca3663b73216e685a85
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Tue Jan 13 07:23:55 2015 +1100

    AGESA: Remove totally useless ASCII-art
    
    Change-Id: I2776e546523c0abed47111033d67697754331229
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/northbridge/amd/cimx/rd890/NbPlatform.h                         | 1 -
 src/vendorcode/amd/agesa/f10/Include/GeneralServices.h              | 4 ----
 src/vendorcode/amd/agesa/f10/Include/GnbInterfaceStub.h             | 3 ---
 src/vendorcode/amd/agesa/f10/Include/OptionDmi.h                    | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionMemory.h                 | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionMultiSocket.h            | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionPstate.h                 | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionSlit.h                   | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionSrat.h                   | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionWhea.h                   | 4 ----
 src/vendorcode/amd/agesa/f10/Include/OptionsHt.h                    | 4 ----
 src/vendorcode/amd/agesa/f10/Include/PlatformMemoryConfiguration.h  | 3 ---
 src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c               | 1 -
 src/vendorcode/amd/agesa/f10/Legacy/Proc/agesaCallouts.c            | 5 -----
 src/vendorcode/amd/agesa/f10/Legacy/Proc/hobTransfer.c              | 4 ----
 src/vendorcode/amd/agesa/f10/Lib/amdlib.c                           | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c      | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PackageType.h  | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c          | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h          | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.c          | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.h          | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c     | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c  | 1 -
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c  | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c   | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c   | 4 ----
 .../f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c     | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c     | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c  | 1 -
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c  | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c   | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c   | 4 ----
 .../f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c     | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c     | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c          | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c      | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c      | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c      | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c  | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c   | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c   | 4 ----
 .../f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c     | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c     | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c      | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c  | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c   | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c    | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c   | 4 ----
 .../f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c     | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c     | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c      | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandId.c   | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c           | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c          | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c           | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c        | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c           | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c          | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c          | 5 -----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c        | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c     | 1 -
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Dmi.c       | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.c | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.h | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c      | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h      | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c          | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PciTables.c | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.c           | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.h           | 4 ----
 .../agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.c           | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.h           | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Pstate.c    | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c      | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h      | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.h | 4 ----
 .../amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c   | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Family/cpuFamRegisters.h      | 1 -
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.c     | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.h     | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.c          | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.h          | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCacheFlushOnHalt.c | 1 -
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCoreLeveling.c     | 1 -
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c              | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatureLeveling.c  | 1 -
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.c         | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.h         | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHtAssist.h         | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.c      | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.h      | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuPstateTables.h     | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSlit.c             | 5 -----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSrat.c             | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuWhea.c             | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/S3.c                          | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/S3.h                          | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/Table.c                       | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cahalt.c                      | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.c            | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.h            | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBist.c                     | 2 --
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBrandId.c                  | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.c                | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.h                | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEnvInit.h                  | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEventLog.c                 | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.c        | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.h        | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuGeneralServices.c          | 6 ------
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuInitEarlyTable.c           | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuMicrocodePatch.c           | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmt.c                | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.c     | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.h     | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.c    | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.h    | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSystemTables.h    | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuRegisters.h                | 2 --
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuServices.h                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/cpuWarmReset.c                | 5 -----
 src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.c                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.h                 | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEarly.c             | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEnv.c               | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitLate.c              | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitMid.c               | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitPost.c              | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitRecovery.c          | 2 --
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitReset.c             | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitResume.c            | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdLateRunApTask.c         | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3LateRestore.c         | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3Save.c                | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/CommonInits.c              | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/CreateStruct.c             | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Common/S3RestoreState.c           | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/Common/S3SaveState.c              | 3 ---
 src/vendorcode/amd/agesa/f10/Proc/IDS/IdsLib.h                      | 1 -
 src/vendorcode/amd/agesa/f10/Proc/Mem/Main/mu.c                     | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.h        | 4 ----
 src/vendorcode/amd/agesa/f12/Include/GeneralServices.h              | 4 ----
 src/vendorcode/amd/agesa/f12/Include/GnbInterfaceStub.h             | 3 ---
 src/vendorcode/amd/agesa/f12/Include/OptionDmi.h                    | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionFamily12hEarlySample.h   | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionGfxRecovery.h            | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionGnb.h                    | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionMemory.h                 | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionMultiSocket.h            | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionPstate.h                 | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionSlit.h                   | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionSrat.h                   | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionWhea.h                   | 4 ----
 src/vendorcode/amd/agesa/f12/Include/OptionsHt.h                    | 4 ----
 src/vendorcode/amd/agesa/f12/Include/PlatformMemoryConfiguration.h  | 3 ---
 src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c               | 1 -
 src/vendorcode/amd/agesa/f12/Legacy/Proc/agesaCallouts.c            | 5 -----
 src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Lib/amdlib.c                           | 4 ----
 src/vendorcode/amd/agesa/f12/Lib/amdlib.h                           | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10InitEarlyTable.c          | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10IoCstate.c     | 3 ---
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PackageType.h  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c         | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h         | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c          | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h          | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.c          | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.h          | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c     | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c  | 1 -
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c   | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c   | 4 ----
 .../f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c     | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c     | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c  | 1 -
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c   | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c   | 4 ----
 .../f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c     | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c     | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c          | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c          | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c      | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c   | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c   | 4 ----
 .../f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c     | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c     | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c      | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c   | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c    | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c   | 4 ----
 .../f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c     | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c     | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c      | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c   | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c   | 4 ----
 .../f12/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandId.c   | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c           | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c          | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c           | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c        | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c           | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c          | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c          | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c        | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c     | 1 -
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Cpb.c       | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Dmi.c       | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.c | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.h | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c          | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PciTables.c | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.c           | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.h           | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.c           | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.h           | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Pstate.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.h | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c   | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c     | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12C6State.c      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12Cpb.c          | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12IoCstate.c     | 2 --
 .../amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c  | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12PackageType.h  | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnEquivalenceTable.c   | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnLogicalIdTables.c    | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x12/LN/F12LnMicrocodePatchTables.c   | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandId.c   | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFm1.c           | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFs1.c           | 5 -----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12CacheDefaults.c        | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Dmi.c       | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.h    | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PciTables.c | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PerCorePciTables.c     | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.c           | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.h           | 4 ----
 .../agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerMgmtSystemTables.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.c           | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.h           | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Pstate.c    | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.c      | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.h      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.h | 4 ----
 .../amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12WheaInitDataTables.c   | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Family/cpuFamRegisters.h      | 1 -
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.c     | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.h     | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.c          | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.h          | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCacheFlushOnHalt.c | 1 -
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCoreLeveling.c     | 1 -
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.h              | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatureLeveling.c  | 1 -
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.c         | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.h         | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.c         | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.h         | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuL3Features.h       | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.c     | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.h     | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.c      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.h      | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuPstateTables.h     | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSlit.c             | 5 -----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSrat.c             | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuWhea.c             | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c                          | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/S3.h                          | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/Table.c                       | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cahalt.c                      | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c            | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.h            | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBist.c                     | 2 --
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBrandId.c                  | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.c                | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.h                | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEnvInit.h                  | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEventLog.c                 | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.c        | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.h        | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuGeneralServices.c          | 6 ------
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuInitEarlyTable.c           | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c           | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmt.c                | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.c     | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.h     | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.c    | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.h    | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSystemTables.h    | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuRegisters.h                | 2 --
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuServices.h                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/cpuWarmReset.c                | 5 -----
 src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.h                 | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEarly.c             | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEnv.c               | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitLate.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitMid.c               | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitPost.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitRecovery.c          | 2 --
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitReset.c             | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitResume.c            | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdLateRunApTask.c         | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c         | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c                | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/CommonInits.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/CreateStruct.c             | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Common/S3RestoreState.c           | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/Common/S3SaveState.c              | 3 ---
 .../amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c | 1 -
 .../agesa/f12/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c   | 1 -
 .../agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c  | 1 -
 .../amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c | 1 -
 src/vendorcode/amd/agesa/f12/Proc/GNB/Common/GnbLibFeatures.c       | 3 ---
 .../amd/agesa/f12/Proc/GNB/Gfx/Family/LN/F12GfxServices.c           | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxConfigData.c           | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxGmcInit.c              | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtEnvPost.c        | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtMidPost.c        | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtPost.c           | 3 ---
 .../amd/agesa/f12/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c         | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxLib.c                  | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxRegisterAcc.c          | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxStrapsInit.c           | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEarly.c              | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEnv.c                | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtLate.c               | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtMid.c                | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtPost.c               | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtReset.c              | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c      | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLib.c | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c        | 2 --
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c       | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbTable.c          | 3 ---
 .../f12/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c     | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c     | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c    | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c  | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c  | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c    | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c          | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c         | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c   | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c    | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c      | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c | 3 ---
 .../f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c     | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c   | 4 ----
 .../agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c   | 4 ----
 .../agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c    | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c | 3 ---
 .../f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c     | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c     | 3 ---
 .../f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c    | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c    | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c | 3 ---
 .../agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c    | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c   | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c  | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbLclkDpm.c   | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbPowerGate.c | 2 --
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbServices.c  | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmu.c       | 2 --
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbFuseTable.c      | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbLclkDpm.c        | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbConfigData.c             | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInit.c                   | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEarly.c            | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEnv.c              | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtLatePost.c         | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtPost.c             | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtReset.c            | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbPowerMgmt.c              | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbSmuLib.c                 | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlib.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexConfig.c    | 3 ---
 .../amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexServices.c  | 3 ---
 .../amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePhyServices.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePifServices.c      | 3 ---
 .../amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieWrapperServices.c  | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Feature/PciePowerGate.c  | 2 --
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInit.c               | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEarlyPost.c    | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEnv.c          | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtLatePost.c     | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtPost.c         | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieLateInit.c           | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortInit.c           | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortLateInit.c       | 3 ---
 src/vendorcode/amd/agesa/f12/Proc/Mem/Main/mu.c                     | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.h        | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/GnbRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/NbInitRecovery.c     | 3 ---
 src/vendorcode/amd/agesa/f14/Include/GeneralServices.h              | 4 ----
 src/vendorcode/amd/agesa/f14/Include/GnbInterfaceStub.h             | 3 ---
 src/vendorcode/amd/agesa/f14/Include/OptionDmi.h                    | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionFamily12hEarlySample.h   | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionFamily14hEarlySample.h   | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionGfxRecovery.h            | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionGnb.h                    | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionMemory.h                 | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionMultiSocket.h            | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionPstate.h                 | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionSlit.h                   | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionSrat.h                   | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionWhea.h                   | 4 ----
 src/vendorcode/amd/agesa/f14/Include/OptionsHt.h                    | 4 ----
 src/vendorcode/amd/agesa/f14/Include/PlatformMemoryConfiguration.h  | 3 ---
 src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c               | 1 -
 src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c            | 5 -----
 src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Lib/amdlib.c                           | 4 ----
 src/vendorcode/amd/agesa/f14/Lib/amdlib.h                           | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c          | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c     | 3 ---
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PackageType.h  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c         | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h         | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.h          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c     | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c  | 1 -
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c   | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c   | 4 ----
 .../f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c     | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c  | 1 -
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c   | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c   | 4 ----
 .../f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c     | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c      | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c   | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c   | 4 ----
 .../f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c     | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c      | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c   | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c    | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c   | 4 ----
 .../f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c     | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c      | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c   | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c   | 4 ----
 .../f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c   | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c           | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c          | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c           | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c        | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c           | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c          | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c          | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c        | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c     | 1 -
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c       | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c       | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.h | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c          | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c           | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.h           | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c           | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.h           | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.h | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c   | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c     | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c  | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c  | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14PackageType.h  | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c   | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c    | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c   | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c          | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c   | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c           | 5 -----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c       | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c         | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.h         | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c     | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c           | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.h           | 4 ----
 .../agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c           | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.h           | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c    | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c      | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.h      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.h | 4 ----
 .../amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c   | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h      | 1 -
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c     | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.h     | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c          | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.h          | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c | 1 -
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c     | 1 -
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.h              | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c  | 1 -
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c         | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h         | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.h         | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c         | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.h         | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c     | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.h     | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.h      | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h     | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c             | 5 -----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c             | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c             | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c                          | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/S3.h                          | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c                       | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c                      | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c            | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h            | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c                     | 2 --
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c                  | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c                | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h                | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h                  | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c                 | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c          | 6 ------
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c           | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c           | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c                | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c     | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.h     | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c    | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.h    | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h    | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h                | 2 --
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c                | 5 -----
 src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h                 | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c             | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c               | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c               | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c          | 2 --
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c             | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c            | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdLateRunApTask.c         | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c         | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c                | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c             | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c           | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c              | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c       | 3 ---
 .../amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c         | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c           | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c              | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c        | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c        | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c           | 3 ---
 .../amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c         | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c                  | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c          | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c           | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c              | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c                | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c               | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c                | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c               | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c              | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c      | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c      | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c        | 2 --
 .../amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c       | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c      | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c      | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c      | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c     | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c    | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c  | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c  | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c  | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c         | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c   | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c    | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c  | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c  | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c      | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c | 3 ---
 .../f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c     | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c   | 4 ----
 .../agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c   | 4 ----
 .../agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c    | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c  | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c    | 3 ---
 .../f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c     | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c     | 3 ---
 .../f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c    | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c    | 3 ---
 .../amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c | 3 ---
 .../agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c  | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c | 3 ---
 .../amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c      | 1 -
 .../amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c          | 2 --
 .../amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c           | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c     | 2 --
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c      | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c        | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c             | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c                   | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c            | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c              | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c         | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c             | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c            | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c              | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c                 | 3 ---
 .../amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c           | 3 ---
 .../amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c  | 3 ---
 .../agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c    | 3 ---
 .../amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c    | 3 ---
 .../amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c    | 3 ---
 .../agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c    | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c  | 2 --
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c               | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c    | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c          | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c     | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c         | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c           | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c            | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c           | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c       | 3 ---
 src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c                     | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.h        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.h        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c     | 3 ---
 src/vendorcode/amd/agesa/f15/Include/GeneralServices.h              | 4 ----
 src/vendorcode/amd/agesa/f15/Include/GnbInterfaceStub.h             | 3 ---
 src/vendorcode/amd/agesa/f15/Include/OptionDmi.h                    | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionFamily15hEarlySample.h   | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionGfxRecovery.h            | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionGnb.h                    | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionMemory.h                 | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionMultiSocket.h            | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionPstate.h                 | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionSlit.h                   | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionSrat.h                   | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionWhea.h                   | 4 ----
 src/vendorcode/amd/agesa/f15/Include/OptionsHt.h                    | 4 ----
 src/vendorcode/amd/agesa/f15/Include/PlatformMemoryConfiguration.h  | 3 ---
 src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c               | 1 -
 src/vendorcode/amd/agesa/f15/Legacy/Proc/agesaCallouts.c            | 5 -----
 src/vendorcode/amd/agesa/f15/Legacy/Proc/hobTransfer.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Lib/amdlib.c                           | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10InitEarlyTable.c          | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10IoCstate.c     | 3 ---
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c      | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PackageType.h  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c         | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h         | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.h          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c  | 1 -
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c   | 4 ----
 .../f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c  | 1 -
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c   | 4 ----
 .../f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c      | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c   | 4 ----
 .../f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c      | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c    | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c   | 4 ----
 .../f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c      | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c   | 4 ----
 .../f15/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandId.c   | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c           | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c          | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c           | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c        | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c           | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c          | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c          | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c        | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c     | 1 -
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Cpb.c       | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Dmi.c       | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.c | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.h | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c          | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PciTables.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.c           | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.h           | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.c           | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.h           | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Pstate.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h      | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.h | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c   | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c     | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PackageType.h  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/F15PstateHpcMode.c           | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrC6State.c | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrCpb.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEarlySamples.c       | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEquivalenceTable.c   | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrHtPhyTables.c        | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrInitEarlyTable.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrIoCstate.c           | 3 ---
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLogicalIdTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLowPwrPstate.c       | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c | 4 ----
 .../f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c   | 4 ----
 .../f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatchTables.c   | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsgBasedC1e.c        | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsrTables.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMultiLinkPciTables.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPciTables.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.c     | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.h     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerMgmtSystemTables.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.c         | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.h         | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSharedMsrTable.c     | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSingleLinkPciTables.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.h          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrWorkaroundsTable.c   | 4 ----
 .../agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCacheFlushOnHalt.c    | 1 -
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.h  | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrDmi.c  | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.h | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.c    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.h    | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrPstate.c          | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.h | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c      | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h      | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Apm.c       | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15BrandId.c   | 5 -----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c        | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.c       | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.h       | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15MsrTables.c | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PciTables.c | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.c           | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.h           | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.c | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.h | 4 ----
 .../amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c   | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Family/cpuFamRegisters.h      | 1 -
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.c     | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.h     | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.h              | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.c          | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.h          | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCacheFlushOnHalt.c | 1 -
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCoreLeveling.c     | 1 -
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.h              | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatureLeveling.c  | 1 -
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.c         | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.h         | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.c         | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.h         | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuL3Features.h       | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.c     | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.h     | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.c      | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.h      | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.c    | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.h    | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateTables.h     | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSlit.c             | 5 -----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSrat.c             | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.c            | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.h            | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuWhea.c             | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/S3.c                          | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/S3.h                          | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/Table.c                       | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cahalt.c                      | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.c            | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.h            | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBist.c                     | 2 --
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBrandId.c                  | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.c                | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.h                | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEnvInit.h                  | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEventLog.c                 | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.c        | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.h        | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuGeneralServices.c          | 6 ------
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuInitEarlyTable.c           | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuMicrocodePatch.c           | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.c                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.h                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmt.c                | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.c     | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.h     | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.c    | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.h    | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSystemTables.h    | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuRegisters.h                | 2 --
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuServices.h                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/cpuWarmReset.c                | 5 -----
 src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.c                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.h                 | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEarly.c             | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEnv.c               | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitLate.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitMid.c               | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitPost.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitRecovery.c          | 2 --
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c             | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitResume.c            | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdLateRunApTask.c         | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c         | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c                | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/CommonInits.c              | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/CommonReturns.c            | 1 -
 src/vendorcode/amd/agesa/f15/Proc/Common/CreateStruct.c             | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Common/S3RestoreState.c           | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/Common/S3SaveState.c              | 3 ---
 src/vendorcode/amd/agesa/f15/Proc/Mem/Main/mu.c                     | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.c        | 4 ----
 src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.h        | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/GeneralServices.h            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionDmi.h                  | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecovery.h          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionGnb.h                  | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocket.h          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionSlit.h                 | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionSrat.h                 | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionWhea.h                 | 4 ----
 src/vendorcode/amd/agesa/f15tn/Include/OptionsHt.h                  | 4 ----
 .../amd/agesa/f15tn/Include/PlatformMemoryConfiguration.h           | 3 ---
 src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c             | 1 -
 src/vendorcode/amd/agesa/f15tn/Legacy/Proc/agesaCallouts.c          | 5 -----
 src/vendorcode/amd/agesa/f15tn/Legacy/Proc/hobTransfer.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Lib/amdlib.c                         | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/F15PstateHpcMode.c         | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnC6State.c          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnCpb.c   | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnEquivalenceTable.c | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnInitEarlyTable.c   | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnIoCstate.c         | 3 ---
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c  | 4 ----
 .../f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c | 4 ----
 .../agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatchTables.c | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMsrTables.c        | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPackageType.h      | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPciTables.c        | 4 ----
 .../f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerMgmtSystemTables.c      | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.c       | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.h       | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnSharedMsrTable.c   | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.c        | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.h        | 4 ----
 .../agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCacheFlushOnHalt.c  | 1 -
 .../agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.c    | 4 ----
 .../agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.h    | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnDmi.c           | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnHtc.c           | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.c  | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.h  | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.c    | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.h    | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPsi.c           | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPstate.c        | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c    | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h    | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Apm.c     | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15BrandId.c | 5 -----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c      | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Crat.c    | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.c     | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.h     | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.c | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.h | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MsrTables.c          | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PciTables.c          | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.c         | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.h         | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.c          | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.h          | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/cpuFamRegisters.h    | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.c   | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.h   | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.h            | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.c        | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.h        | 3 ---
 .../amd/agesa/f15tn/Proc/CPU/Feature/cpuCacheFlushOnHalt.c          | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCdit.c           | 5 -----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCoreLeveling.c   | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.h            | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.c           | 5 -----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.h           | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c            | 4 ----
 .../amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatureLeveling.c           | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.c       | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.h       | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.h            | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.c          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.h          | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.c       | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.h       | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuL3Features.h     | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.c   | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.h   | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.c    | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.h    | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.h            | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.c  | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.h  | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateTables.h   | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSlit.c           | 5 -----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSrat.c           | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.c          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.h          | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuWhea.c           | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c                        | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.h                        | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/Table.c                     | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/TableHt.c                   | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cahalt.c                    | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.c          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.h          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBist.c                   | 2 --
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBrandId.c                | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.c              | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.h              | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEnvInit.h                | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEventLog.c               | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c      | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.h      | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuGeneralServices.c        | 6 ------
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuInitEarlyTable.c         | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.c               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.h               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuMicrocodePatch.c         | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.c               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.h               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmt.c              | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.c   | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.h   | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.c  | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.h  | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSystemTables.h  | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h              | 2 --
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuServices.h               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuWarmReset.c              | 5 -----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.c               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.h               | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.h            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEarly.c           | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEnv.c             | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitLate.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitMid.c             | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitPost.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitRecovery.c        | 2 --
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitReset.c           | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitResume.c          | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdLateRunApTask.c       | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3LateRestore.c       | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3Save.c              | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonInits.c            | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonReturns.c          | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/Common/CreateStruct.c           | 4 ----
 src/vendorcode/amd/agesa/f15tn/Proc/Common/S3RestoreState.c         | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/Common/S3SaveState.c            | 3 ---
 .../agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c   | 1 -
 .../agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c | 1 -
 .../f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c      | 1 -
 .../agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c   | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/GnbLibFeatures.c     | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEarly.c            | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEnv.c              | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtLate.c             | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtMid.c              | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtPost.c             | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtReset.c            | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtS3Save.c           | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLib.c          | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c      | 2 --
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c     | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c    | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c   | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c   | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c  | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c      | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c      | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c  | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxEnvInitTN.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxGmcInitTN.c       | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c     | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c           | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxMidInitTN.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxPostInitTN.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxTablesTN.c        | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbBapmCoeffCalcTN.c | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEarlyInitTN.c     | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEnvInitTN.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbFuseTableTN.c     | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbIommuIvrsTN.c     | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbMidInitTN.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbPostInitTN.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbRegisterAccTN.c   | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbTablesTN.c        | 4 ----
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFM2.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFS1.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieComplexDataTN.c  | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieConfigTN.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEarlyInitTN.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEnvInitTN.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieLibTN.c          | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieMidInitTN.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePostInitTN.c     | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePowerGateTN.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieTablesTN.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c        | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbMSocketLib/GnbMSocketLib.c  | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c    | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c    | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c         | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c       | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c   | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c  | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c    | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c    | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c     | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c   | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c | 4 ----
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c | 4 ----
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c  | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c      | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c   | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c   | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c   | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c  | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c  | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieMaxPayloadV4.c      | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c    | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePowerMgmtV4.c | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c | 3 ---
 .../agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c   | 3 ---
 .../f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c      | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c  | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c  | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c | 3 ---
 .../amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c           | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSview/GnbSview.c | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbTable/GnbTable.c | 3 ---
 src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsIdtTable.c         | 2 --
 src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h                    | 1 -
 src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mu.c                   | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/GeneralServices.h            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionCdit.h                 | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionCrat.h                 | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionDmi.h                  | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hEarlySample.h | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecovery.h          | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionGnb.h                  | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionMemory.h               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocket.h          | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionPstate.h               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionSlit.h                 | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionSrat.h                 | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionWhea.h                 | 4 ----
 src/vendorcode/amd/agesa/f16kb/Include/OptionsHt.h                  | 4 ----
 .../amd/agesa/f16kb/Include/PlatformMemoryConfiguration.h           | 3 ---
 src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c             | 1 -
 src/vendorcode/amd/agesa/f16kb/Legacy/Proc/agesaCallouts.c          | 5 -----
 src/vendorcode/amd/agesa/f16kb/Legacy/Proc/hobTransfer.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Lib/amdlib.c                         | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbC6State.c          | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCacheFlushOnHalt.c | 1 -
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.h   | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCpb.c   | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbEquivalenceTable.c | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbHtc.c   | 4 ----
 .../agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbIoCstate.c         | 3 ---
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbLogicalIdTables.c  | 4 ----
 .../agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatchTables.c | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMsrTables.c        | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.c     | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.h     | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c        | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.c       | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.h       | 4 ----
 .../f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerMgmtSystemTables.c      | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPsi.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPstate.c           | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbSharedMsrTable.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c        | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.h        | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Apm.c     | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16BrandId.c | 5 -----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16CacheDefaults.c      | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.c     | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.h     | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.c | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.h | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MsrUnknownTables.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16PciUnknownTables.c   | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.c          | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.h          | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/cpuFamRegisters.h    | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/PreserveMailbox.h   | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.h            | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.c        | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.h        | 3 ---
 .../amd/agesa/f16kb/Proc/CPU/Feature/cpuCacheFlushOnHalt.c          | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCdit.c           | 5 -----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCoreLeveling.c   | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.h            | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.c           | 5 -----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.h           | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuDmi.c            | 4 ----
 .../amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatureLeveling.c           | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.c       | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.h       | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.h            | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.c       | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.h       | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuL3Features.h     | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuMsgBasedC1e.h    | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPrefetchMode.h   | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.h            | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateHpcMode.h  | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateTables.h   | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSlit.c           | 5 -----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSrat.c           | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuTdpLimiting.h    | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuWhea.c           | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c                        | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.h                        | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/Table.c                     | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cahalt.c                    | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.c          | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.h          | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuBist.c                   | 2 --
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.c              | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.h              | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEnvInit.h                | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEventLog.c               | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.c      | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.h      | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuGeneralServices.c        | 6 ------
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.c               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.h               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuMicrocodePatch.c         | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.c               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.h               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmt.c              | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.c  | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.h  | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSystemTables.h  | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuRegisters.h              | 2 --
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuServices.h               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuWarmReset.c              | 5 -----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.c               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.h               | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/CPU/mmioMapManager.h            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEarly.c           | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEnv.c             | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitLate.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitMid.c             | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitPost.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitReset.c           | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitResume.c          | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdLateRunApTask.c       | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3LateRestore.c       | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3Save.c              | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonInits.c            | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonReturns.c          | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/Common/CreateStruct.c           | 4 ----
 src/vendorcode/amd/agesa/f16kb/Proc/Common/S3RestoreState.c         | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/Common/S3SaveState.c            | 3 ---
 .../agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/EnvDefYangtze.c   | 1 -
 .../agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/ResetDefYangtze.c | 1 -
 .../f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataEnvService.c      | 1 -
 .../agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataService.c   | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/GnbLibFeatures.c     | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEarly.c            | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEnv.c              | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtLate.c             | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtMid.c              | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtPost.c             | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtReset.c            | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtS3Save.c           | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLib.c          | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c      | 2 --
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c     | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c    | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c   | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c   | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c  | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c      | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c  | 3 ---
 .../Proc/GNB/Modules/GnbGfxIntTableV3/GfxIntegratedInfoTable.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c    | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxPwrPlayTable.c | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibKB.c  | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxEnvInitKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxGmcInitKB.c       | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c     | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxLibKB.c           | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxMidInitKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxPostInitKB.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxSamuInitKB.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxTablesKB.c        | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEarlyInitKB.c     | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEnvInitKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbIommuTablesKB.c   | 4 ----
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbMidInitKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbPostInitKB.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbRegisterAccKB.c   | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbTablesKB.c        | 4 ----
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraKB.c           | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraTokenMapKB.c   | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieComplexDataKB.c  | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieConfigKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEarlyInitKB.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEnvInitKB.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieLibKB.c          | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieMidInitKB.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PciePostInitKB.c     | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieTablesKB.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/GnbIoapic.c          | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c    | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/GnbNbInitLibV5.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/PcieAlibV2.c     | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c         | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c       | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c   | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c  | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c    | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c    | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c     | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c | 4 ----
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c  | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c   | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c  | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c  | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c    | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePhyServicesV5.c     | 4 ----
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePifServicesV5.c     | 4 ----
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePortServicesV5.c    | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieSiliconServicesV5.c | 3 ---
 .../Proc/GNB/Modules/GnbPcieInitLibV5/PcieTopologyServicesV5.c      | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieWrapperServicesV5.c | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/PcieMaxPayload.c | 3 ---
 .../agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieTrainingV2.c | 3 ---
 .../f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieWorkaroundsV2.c    | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c  | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c           | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/GnbScsLibV1.c      | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/GnbSmuInitLibV7.c  | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/GnbSview.c | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/GnbTable.c | 3 ---
 .../amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/GnbUraLibV1.c      | 3 ---
 src/vendorcode/amd/agesa/f16kb/Proc/IDS/IdsLib.h                    | 1 -
 src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/mu.c                   | 4 ----
 src/vendorcode/amd/cimx/rd890/amdAcpiIvrs.c                         | 4 ----
 src/vendorcode/amd/cimx/rd890/amdAcpiLib.c                          | 4 ----
 src/vendorcode/amd/cimx/rd890/amdAcpiMadt.c                         | 4 ----
 src/vendorcode/amd/cimx/rd890/amdDebugOutLib.c                      | 4 ----
 src/vendorcode/amd/cimx/rd890/amdSbLib.c                            | 4 ----
 src/vendorcode/amd/cimx/rd890/nbDispatcher.c                        | 4 ----
 src/vendorcode/amd/cimx/rd890/nbEventLog.c                          | 3 ---
 src/vendorcode/amd/cimx/rd890/nbHtInit.c                            | 4 ----
 src/vendorcode/amd/cimx/rd890/nbHtInterface.c                       | 4 ----
 src/vendorcode/amd/cimx/rd890/nbInit.c                              | 4 ----
 src/vendorcode/amd/cimx/rd890/nbInitializer.c                       | 4 ----
 src/vendorcode/amd/cimx/rd890/nbInterface.c                         | 4 ----
 src/vendorcode/amd/cimx/rd890/nbIoApic.c                            | 4 ----
 src/vendorcode/amd/cimx/rd890/nbIommu.c                             | 1 -
 src/vendorcode/amd/cimx/rd890/nbIommu.h                             | 3 ---
 src/vendorcode/amd/cimx/rd890/nbLib.c                               | 4 ----
 src/vendorcode/amd/cimx/rd890/nbMaskedMemoryInit.c                  | 4 ----
 src/vendorcode/amd/cimx/rd890/nbMiscInit.c                          | 4 ----
 src/vendorcode/amd/cimx/rd890/nbModuleInfo.c                        | 2 --
 src/vendorcode/amd/cimx/rd890/nbPcieAspm.c                          | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieCplBuffers.c                    | 3 ---
 src/vendorcode/amd/cimx/rd890/nbPcieEarlyHwLib.c                    | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieHotplug.c                       | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieInitEarly.c                     | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieInitLate.c                      | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieLateHwLib.c                     | 2 --
 src/vendorcode/amd/cimx/rd890/nbPcieLib.c                           | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieLinkWidth.c                     | 3 ---
 src/vendorcode/amd/cimx/rd890/nbPciePllControl.c                    | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPciePortRemap.c                     | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieRecovery.c                      | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieSb.c                            | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPcieWorkarounds.c                   | 4 ----
 src/vendorcode/amd/cimx/rd890/nbPowerOnReset.c                      | 4 ----
 src/vendorcode/amd/cimx/rd890/nbRecovery.c                          | 3 ---
 src/vendorcode/amd/cimx/rd890/nbRecoveryInitializer.c               | 3 ---
 src/vendorcode/amd/cimx/sb800/DISPATCHER.c                          | 3 ---
 src/vendorcode/amd/cimx/sb800/SbModInf.c                            | 2 --
 src/vendorcode/amd/cimx/sb900/Dispatcher.c                          | 3 ---
 src/vendorcode/amd/cimx/sb900/SbModInf.c                            | 2 --
 1565 files changed, 5638 deletions(-)

diff --git a/src/northbridge/amd/cimx/rd890/NbPlatform.h b/src/northbridge/amd/cimx/rd890/NbPlatform.h
index 5b24224..db57aab 100644
--- a/src/northbridge/amd/cimx/rd890/NbPlatform.h
+++ b/src/northbridge/amd/cimx/rd890/NbPlatform.h
@@ -63,7 +63,6 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/GeneralServices.h b/src/vendorcode/amd/agesa/f10/Include/GeneralServices.h
index 30be255..732438e 100644
--- a/src/vendorcode/amd/agesa/f10/Include/GeneralServices.h
+++ b/src/vendorcode/amd/agesa/f10/Include/GeneralServices.h
@@ -47,12 +47,10 @@
 #define _GENERAL_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NUMBER_OF_EVENT_DATA_PARAMS 4
@@ -64,7 +62,6 @@
 #define AMD_DEV_VEN_ID_ADDRESS 0
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct {
 } AGESA_EVENT;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/GnbInterfaceStub.h b/src/vendorcode/amd/agesa/f10/Include/GnbInterfaceStub.h
index 0aaaa27..8c2dc93 100644
--- a/src/vendorcode/amd/agesa/f10/Include/GnbInterfaceStub.h
+++ b/src/vendorcode/amd/agesa/f10/Include/GnbInterfaceStub.h
@@ -49,19 +49,16 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h
index df419d5..de81f0a 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionDmi.h
@@ -45,18 +45,15 @@
 #define _OPTION_DMI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct  {
 } OPTION_DMI_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f10/Include/OptionMemory.h
index 6b0e244..f51ae32 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionMemory.h
@@ -51,19 +51,16 @@
 #include "ma.h"
 #include "mp.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MAX_FF_TYPES      6   ///< Maximum number of DDR Form factors (UDIMMs, RDIMMMs, SODIMMS) supported
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -236,7 +233,6 @@ typedef struct _MEM_NB_SUPPORT {
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 /* Feature Default Return */
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionMultiSocket.h b/src/vendorcode/amd/agesa/f10/Include/OptionMultiSocket.h
index a4bac6c..1e2c640 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionMultiSocket.h
@@ -45,18 +45,15 @@
 #define _OPTION_MULTISOCKET_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -148,7 +145,6 @@ typedef struct  {
 } OPTION_MULTISOCKET_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f10/Include/OptionPstate.h
index 64f6e0a..9ab120b 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionPstate.h
@@ -45,17 +45,14 @@
 #define _OPTION_PSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -96,7 +93,6 @@ typedef struct  {
 } OPTION_PSTATE_LATE_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h
index e86fb26..94d8e2f 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionSlit.h
@@ -45,18 +45,15 @@
 #define _OPTION_SLIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +85,6 @@ typedef struct  {
 } OPTION_SLIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h
index 29ff590..b1d3727 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionSrat.h
@@ -45,18 +45,15 @@
 #define _OPTION_SRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +71,6 @@ typedef struct  {
 } OPTION_SRAT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h
index 495c0aa..72b1544 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionWhea.h
@@ -45,18 +45,15 @@
 #define _OPTION_WHEA_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +72,6 @@ typedef struct  {
 } OPTION_WHEA_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f10/Include/OptionsHt.h
index 8bf3e87..e7d4ff8 100644
--- a/src/vendorcode/amd/agesa/f10/Include/OptionsHt.h
+++ b/src/vendorcode/amd/agesa/f10/Include/OptionsHt.h
@@ -46,18 +46,15 @@
 #define _OPTION_HT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +90,6 @@ typedef struct {
 } OPTION_HT_INIT_RESET;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/agesa/f10/Include/PlatformMemoryConfiguration.h
index 5f8109a..f495dcf 100644
--- a/src/vendorcode/amd/agesa/f10/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/agesa/f10/Include/PlatformMemoryConfiguration.h
@@ -45,7 +45,6 @@
 #define _PLATFORM_MEMORY_CONFIGURATION_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #ifndef PSO_ENTRY
@@ -53,11 +52,9 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c
index 0034064..5471cd1 100644
--- a/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c
@@ -53,7 +53,6 @@
 #define FILECODE LEGACY_PROC_DISPATCHER_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE DispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f10/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f10/Legacy/Proc/agesaCallouts.c
index d23f188..7ab4176 100644
--- a/src/vendorcode/amd/agesa/f10/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f10/Legacy/Proc/agesaCallouts.c
@@ -57,28 +57,23 @@
 #include "Filecode.h"
 #define FILECODE LEGACY_PROC_AGESACALLOUTS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f10/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f10/Legacy/Proc/hobTransfer.c
index 1dbe440..b40617f 100644
--- a/src/vendorcode/amd/agesa/f10/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f10/Legacy/Proc/hobTransfer.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 #define FILECODE LEGACY_PROC_HOBTRANSFER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -80,7 +77,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Lib/amdlib.c b/src/vendorcode/amd/agesa/f10/Lib/amdlib.c
index 860fb54..0e8bdd1 100644
--- a/src/vendorcode/amd/agesa/f10/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f10/Lib/amdlib.c
@@ -57,19 +57,16 @@
 #define FILECODE LIB_AMDLIB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +90,6 @@ LibAmdGetDataFromPtr (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
index d2bae4b..8adaa0d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_F10MULTILINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PackageType.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PackageType.h
index 105bea5..6e93ca3 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PackageType.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PackageType.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -70,13 +68,11 @@
 #define PACKAGE_TYPE_S1G4                   PACKAGE_TYPE_S1G3_S1G4
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
index 4f6e74d..17b0305 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
@@ -63,12 +63,10 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBCOFVIDINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for performing the steps outlined in
@@ -79,7 +77,6 @@ typedef struct {
 } NB_COF_VID_INIT_WARM;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -97,7 +94,6 @@ PmNbCofVidInitWarmCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
index 0e917e8..3798952 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
index 860e0eb..df3ae93 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
@@ -60,12 +60,10 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBPSTATEINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for modifying the P-state
@@ -76,7 +74,6 @@ typedef struct {
 } NB_PSTATE_INIT;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ PmNbPstateInitCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
index 440690e..7059da2 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
index b83fe65..1401851 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_F10SINGLELINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
index 895fe0b..8318530 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
@@ -71,7 +71,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
index f1c3b42..90f0afe 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
index 440a1c1..3a5e701 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
index 631ca3d..a03a5ac 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
index 442969c..9cc87a9 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
@@ -52,24 +52,20 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES ROMDATA *CpuF10BlMicroCodePatchArray[];
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
index 050e87b..9d48d85 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10BlMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
index c3bbb55..47885d7 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
index fa2f054..d236a73 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
@@ -71,7 +71,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
index fd6fbb7..a916fd5 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
index 29cf145..6afe99b 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
index ef916a9..927e3c4 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DALOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
index 8bb3fcc..e03cebe 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
index e77ccd4..7e41f42 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10DaMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
index 77305cb..27f30db 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
index 6c78fae..1c2356e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch01000085 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c
index a276013..cc1dbb1 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch01000086 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c
index fb11d7f..c8e1d47 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch01000098 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c
index 336692b..fad954e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000b6 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
index 35aefc9..ee0518e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
index 1179d50..f262323 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
@@ -56,17 +56,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ F10InitializeHwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
index f1aaf4b..610aa99 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevCMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
index 6abe389..b14d73e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
index ef5409b..68d305d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
@@ -59,22 +59,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
index 92b76e1..79de653 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
index ab6e671..be6bd69 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
index ca75e5d..63f4525 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
index f98489b..5a58c32 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
index 517bd72..7c748b4 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RbMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
index 5aba3ff..1c260a5 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
index 948cf3d..2e1edd8 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1027,11 +1025,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c4 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
index 3b91785..c7c373c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c5 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
index aa2c738..3343a10 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
@@ -60,17 +60,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDMSGBASEDC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -88,7 +85,6 @@ IsDramScrubberEnabled (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
index 5235603..93e5aa2 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
@@ -59,22 +59,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
index 0f7abcd..a33a7db 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
index 3a6b9af..3aa8a2f 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
index c254bbe..52dcf0d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
@@ -57,22 +57,18 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
index 5bcac87..9906109 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
@@ -50,22 +50,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
index 0923503..9d0608b 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
@@ -52,12 +52,10 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -65,12 +63,10 @@
 extern  CONST MICROCODE_PATCHES ROMDATA *CpuF10HyMicroCodePatchArray[];
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
index 2c441ca..3d49887 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10HyMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
index c8fc912..d7c6ed3 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
index bc27342..98eb405 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
@@ -58,12 +58,10 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUCOMMONF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /**
@@ -84,12 +82,10 @@ typedef union {
 } NODE_ID_MSR;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
index 474981f..bf33e1a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandId.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandId.c
index 9cce68e..8a4de65 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandId.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandId.c
@@ -54,22 +54,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10BRANDID_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +89,6 @@ extern CONST UINT8 F10BrandIdString1TableCount;
 extern CONST UINT8 F10BrandIdString2TableCount;
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
index 1c27f1d..8cf4b4c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
@@ -51,22 +51,18 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -179,7 +175,6 @@ CONST CHAR8 ROMDATA str2_QC_50B[] = "50B Quad-Core Processor";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
index 739d75e..28ee45e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
@@ -52,22 +52,18 @@
 #include "F10PackageType.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -86,7 +82,6 @@ CONST CHAR8 ROMDATA str_L_Processor[] = "L Processor";
 CONST CHAR8 ROMDATA str_L_Dual_Core_Processor[] = "L Dual-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
index 133fb42..eb5a20c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
@@ -51,22 +51,18 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +83,6 @@ CONST CHAR8 ROMDATA str2_GL_EE_C32[] = "GL EE";
 CONST CHAR8 ROMDATA str2_CL_EE[] = "CL EE";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
index 0963f4c..6a33e22 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
@@ -51,22 +51,18 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -110,7 +106,6 @@ CONST CHAR8 ROMDATA str2_KS_HE[] = "KS HE";
 CONST CHAR8 ROMDATA str2_QCP[] = " Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
index dbf12a6..ca6a6d6 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
@@ -51,22 +51,18 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -85,7 +81,6 @@ CONST CHAR8 ROMDATA str2_KS_G34[] = "KS";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
index 676393f..994ab28 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
@@ -51,22 +51,18 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +86,6 @@ CONST CHAR8 ROMDATA str_Athlon_II_DC_M3[] = "AMD Athlon(tm) II Dual-Core M3";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
index af4baff..dce4197 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
@@ -52,22 +52,18 @@
 #include "F10PackageType.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +84,6 @@ CONST CHAR8 ROMDATA str_0_Triple_Core_Processor[] = "0 Triple-Core Processor";
 CONST CHAR8 ROMDATA str_0_Quad_Core_Processor[] = "0 Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
index 4f2296c..95d75e6 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
@@ -53,22 +53,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CACHEDEFAULTS_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
index 6771599..6507d6e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
@@ -71,7 +71,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Dmi.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Dmi.c
index 9959671..02040fb 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Dmi.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Dmi.c
@@ -56,17 +56,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10DMI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -76,7 +73,6 @@ F10Translate7BitVidTo6Bit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
index a0b069c..f9e749c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
@@ -61,12 +61,10 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10EARLYINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Enum for handling code branching while transitioning to the
@@ -79,7 +77,6 @@ typedef enum {
 } GO_TO_STEP;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -96,7 +93,6 @@ WaitForCpuFidAndDidToMatch (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
index ee2c1c3..acea3ff 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
index 17ab548..4940222 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
@@ -56,17 +56,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10FEATURELEVELING_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -84,7 +81,6 @@ updateCpuFeatureList (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
index 3a2829b..8e733bb 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
@@ -48,19 +48,16 @@
 #include "cpuFamilyTranslation.h"
 #include "cpuPostInit.h"
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// F10 CPU Feature Low
@@ -175,7 +172,6 @@ typedef struct {
   CPU_F10_EXT_FEATURES_HI CpuF10ExtFeaturesHi;  ///< High
 } CPU_F10_EXT_FEATURES;
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
index 476a4f4..28e1869 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10HTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10MsrTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10MsrTables.c
index 29840c8..485caa0 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10MsrTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10MsrTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PciTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PciTables.c
index a977be0..4c8f269 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PciTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
index 01cc2d3..dc18320 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
@@ -61,17 +61,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -90,7 +87,6 @@ F10PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
index fe8cd7b..c8c7f2a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -68,7 +65,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
index f6962ab..a710079 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
@@ -61,22 +61,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
index 4e295a8..df99340 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
@@ -63,7 +63,6 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -102,12 +101,10 @@ CONST UINT32 ROMDATA AltvidSlamTime[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -135,7 +132,6 @@ F10PmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
index 39a8f6c..226a5df 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Pstate.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Pstate.c
index c9e15ff..e8ba5a1 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Pstate.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Pstate.c
@@ -57,22 +57,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
index f620a3b..d7dcab1 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
@@ -57,22 +57,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10SOFTWARETHERMAL_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
index d346d54..66057c0 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.c
index ab45ad1..9eee85d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.c
@@ -61,7 +61,6 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Register encodings for F3xD8[VSRampTime/VSSlamTime]
@@ -78,17 +77,14 @@ CONST UINT32 ROMDATA VSSlamTime[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.h
index a968aeb..06c3c6e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10Utilities.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -70,7 +67,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
index 04a713c..d88ad33 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
@@ -51,22 +51,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WHEAINITDATATABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/cpuFamRegisters.h
index 4a027a8..5ae9e18 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/cpuFamRegisters.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/cpuFamRegisters.h
@@ -56,7 +56,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.c
index 8603c49..74283bb 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.c
@@ -63,22 +63,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_PRESERVEMAILBOX_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PreserveMailboxFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.h
index 2fc9321..60aae1a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/PreserveMailbox.h
@@ -47,7 +47,6 @@
 #define _PRESERVE_MAILBOX_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #define MAX_PRESERVE_REGISTER_ENTRIES 2      ///< There is room on the heap for up to this per node.
@@ -56,12 +55,10 @@
 typedef UINT32 (*MAILBOX_REGISTER_SAVE_ENTRY) [MAX_PRESERVE_REGISTER_ENTRIES];
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.c
index a463e94..b2bf667 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.c
@@ -59,17 +59,14 @@
 #define FILECODE PROC_CPU_FEATURE_CPUC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ EnableC6OnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE C6FamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.h
index c782049..e6a0cb0 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuC6State.h
@@ -46,14 +46,12 @@
 #define _CPU_C6_STATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration.
 typedef struct _C6_FAMILY_SERVICES C6_FAMILY_SERVICES;
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +72,6 @@ typedef struct _C6_FAMILY_SERVICES C6_FAMILY_SERVICES;
 #define   CST_C2_TYPE           0x02
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index 6c1b6fe..6d0db2a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -74,7 +74,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CacheFlushOnHaltFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCoreLeveling.c
index 5af4fbd..d5ec4b6 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -75,7 +75,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CoreLevelingFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c
index 261e25b..efab53c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuDmi.c
@@ -58,18 +58,15 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_CPUDMI_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
@@ -87,7 +84,6 @@ IntToString (
 );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatureLeveling.c
index 93f42ec..57491a8 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -74,7 +74,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.c
index 75f0179..3a8ffa2 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.c
@@ -51,22 +51,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_CPUFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 extern CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[];
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.h
index d198687..28c24d6 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuFeatures.h
@@ -141,17 +141,14 @@
 
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 #define CPU_FEAT_AFTER_PM_INIT          (0x0000000000000001ull)
@@ -234,7 +231,6 @@ typedef struct {
 } CPU_FEATURE_TABLE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHtAssist.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHtAssist.h
index 4a006e5..7c86833 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHtAssist.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHtAssist.h
@@ -47,21 +47,18 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration.
 typedef struct _HT_ASSIST_FAMILY_SERVICES HT_ASSIST_FAMILY_SERVICES;
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_DISABLE_CACHE (0x00000000 | PROC_CPU_FEATURE_CPUHTASSIST_FILECODE)
 #define AP_LATE_TASK_ENABLE_CACHE  (0x00010000 | PROC_CPU_FEATURE_CPUHTASSIST_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 #define L3_SCRUBBER_CONTEXT_ARRAY_SIZE 4
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.c
index 75ebef5..160d819 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.c
@@ -60,22 +60,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_CPUHWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE HwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.h
index 1750ed9..9f7b608 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuHwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_HW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration.
 typedef struct _HW_C1E_FAMILY_SERVICES HW_C1E_FAMILY_SERVICES;
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.c
index 1428e77..7df9c7c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.c
@@ -60,17 +60,14 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_CPUMSGBASEDC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,7 +79,6 @@ EnableMsgC1eOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE MsgBasedC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.h
index 25928aa..610e343 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuMsgBasedC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_MSG_BASED_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration.
 typedef struct _MSG_BASED_C1E_FAMILY_SERVICES MSG_BASED_C1E_FAMILY_SERVICES;
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuPstateTables.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuPstateTables.h
index b659155..b3b08d4 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuPstateTables.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuPstateTables.h
@@ -46,19 +46,16 @@
 #define _CPU_PSTATE_TABLES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration.
 typedef struct _PSTATE_CPU_FAMILY_SERVICES PSTATE_CPU_FAMILY_SERVICES;
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSlit.c
index e240ce8..fc946c5 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSlit.c
@@ -64,7 +64,6 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_CPUSLIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,12 +83,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuSlitHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -100,13 +97,11 @@ AcpiSlitHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSrat.c
index c5b969e..bdb498b 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuSrat.c
@@ -76,7 +76,6 @@ GetAcpiSratMain (
   IN OUT   VOID                  **SratPtr
   );
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config record
@@ -85,7 +84,6 @@ extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config
 #define FOURGB 0x010000
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -110,7 +108,6 @@ STATIC CPU_SRAT_HEADER  ROMDATA CpuSratHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
@@ -142,7 +139,6 @@ STATIC
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuWhea.c
index dcef101..a9070ff 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Feature/cpuWhea.c
@@ -56,19 +56,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_FEATURE_CPUWHEA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 extern OPTION_WHEA_CONFIGURATION OptionWheaConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -80,7 +77,6 @@ CreateHestBank (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.c
index cb30858..65e465b 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_S3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -146,7 +143,6 @@ RestoreConditionalMsrDevice (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.h
index 616955e..f88496c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/S3.h
@@ -46,19 +46,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -316,7 +313,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/Table.c
index 59579af..3c998ad 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/Table.c
@@ -64,22 +64,18 @@
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cahalt.c
index 2421bb9..f62b73f 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cahalt.c
@@ -57,19 +57,16 @@
 #include "Filecode.h"
 
  /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 // typedef unsigned int   uintptr_t;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -107,7 +104,6 @@ ExecuteWbinvdInstruction (
   );
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.c
index 71c890d..c2d5f49 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.c
@@ -60,7 +60,6 @@
 #define FILECODE PROC_CPU_CPUAPICUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /* ApFlags bits */
@@ -82,7 +81,6 @@
 #define SEG_DESC_TYPE_TRAP32 0x0F
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +110,6 @@ typedef struct {
 #endif
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -194,7 +191,6 @@ PerformFinalHalt (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.h
index 22acdca..3a083d2 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuApicUtilities.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define APIC_CTRL_DWORD 0xF
@@ -104,7 +102,6 @@
 #define SIZE_IN_DWORDS(sInput) ((UINT32) (((sizeof (sInput)) + 3) >> 2))
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID (*PF_AP_TASK) (AMD_CONFIG_PARAMS *StdHeader);
@@ -161,7 +158,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 //                   These are   P U B L I C   functions, used by AGESA
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBist.c
index 8114338..015e288 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBist.c
@@ -57,7 +57,6 @@
 #define FILECODE PROC_CPU_CPUBIST_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -68,7 +67,6 @@ GetBistResults (
   );
 
  /*----------------------------------------------------------------------------------------
-  *                          E X P O R T E D    F U N C T I O N S
   *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBrandId.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBrandId.c
index 375184f..45e0f5c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBrandId.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuBrandId.c
@@ -57,12 +57,10 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUBRANDID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA strEngSample[] = "AMD Engineering Sample";
@@ -76,12 +74,10 @@ CONST AMD_CPU_BRAND ROMDATA Dflt_Str2 = {0, 0, 0, SOCKET_IGNORE, DR_NO_STRING, D
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.c
index 31a761b..7580ac0 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.c
@@ -63,22 +63,18 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.h
index c8c9eab..06098dc 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEarlyInit.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 typedef struct _CPU_CORE_LEVELING_FAMILY_SERVICES CPU_CORE_LEVELING_FAMILY_SERVICES;
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -86,7 +84,6 @@ typedef struct _CPU_CORE_LEVELING_FAMILY_SERVICES CPU_CORE_LEVELING_FAMILY_SERVI
 
 #define MICROCODE_PATCH_SIZE    2048
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -197,7 +194,6 @@ struct _CPU_CORE_LEVELING_FAMILY_SERVICES {
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEnvInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEnvInit.h
index 74cbfc9..11218c0 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEnvInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEnvInit.h
@@ -46,22 +46,18 @@
 #define _CPU_ENV_INIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 // HobTransfer
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEventLog.c
index 3c41f5d..b5e0cf6 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuEventLog.c
@@ -54,13 +54,11 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUEVENTLOG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define TOTAL_EVENT_LOG_BUFFERS  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +82,6 @@ typedef struct {
 } AGESA_STRUCT_BUFFER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.c
index 063eee2..8fc68dc 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.c
@@ -56,12 +56,10 @@
 #define FILECODE PROC_CPU_CPUFAMILYTRANSLATION_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -110,7 +108,6 @@ CONST CPU_SPECIFIC_SERVICES ROMDATA cpuNullServices =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -123,7 +120,6 @@ GetCpuServices (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpuSupportedFamiliesTable;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.h
index 7bb6fcd..5f7bea5 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuFamilyTranslation.h
@@ -129,7 +129,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 #include "cpuPostInit.h"
@@ -143,12 +142,10 @@
 AGESA_FORWARD_DECLARATION (CPU_SPECIFIC_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /**
@@ -919,7 +916,6 @@ typedef struct {
 } CPU_FAMILY_ID_XLAT_TABLE;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuGeneralServices.c
index 8e30679..04fa437 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuGeneralServices.c
@@ -61,24 +61,20 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUGENERALSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTIONS_CONFIG_TOPOLOGY TopologyConfiguration;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 
@@ -179,7 +175,6 @@ AmdIdentifyCore (
 }
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - AGESA common General Services
  *----------------------------------------------------------------------------------------
  */
 
@@ -310,7 +305,6 @@ IdentifyCore (
 
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - cpu component General Services
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuInitEarlyTable.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuInitEarlyTable.c
index bebadca..dabbe0a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuInitEarlyTable.c
@@ -54,22 +54,18 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.c
index 9758e4a..b71ac6b 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.c
@@ -56,17 +56,14 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPULATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -74,7 +71,6 @@ DisableCf8ExtCfg (
   IN       AMD_CONFIG_PARAMS   *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.h
index 34d2568..649f2f6 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuLateInit.h
@@ -47,12 +47,10 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -303,7 +301,6 @@
 #define     PSTATE_FLAG_2           0xAA
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -736,7 +733,6 @@ typedef struct _CPU_SRAT_MEMORY_ENTRY {
 } CPU_SRAT_MEMORY_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuMicrocodePatch.c
index de6ed87..cf13372 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuMicrocodePatch.c
@@ -56,13 +56,11 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUMICROCODEPATCH_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -71,7 +69,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -104,7 +101,6 @@ GetMicrocodeVersion (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.c
index 50ecdeb..ad2d26d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.c
@@ -68,17 +68,14 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUPOSTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ SetCoresTscFreqSel (
   IN       AMD_CONFIG_PARAMS   *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.h
index 971b755..70b38b3 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPostInit.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 typedef struct _CPU_CFOH_FAMILY_SERVICES CPU_CFOH_FAMILY_SERVICES;
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define P_STATE_DATA_GATHER_TEMP_ADDR     0x200000 ///< Fixed the row data at 2M memory address.
 #define GLOBAL_CPU_FEATURE_LIST_TEMP_ADDR 0x200000 ///< Fixed the row data at 2M memory address.
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -177,7 +174,6 @@ struct _CPU_CFOH_FAMILY_SERVICES {
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmt.c
index 6dfafc8..c5d3149 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmt.c
@@ -59,17 +59,14 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -95,7 +92,6 @@ GoToMemInitPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.c
index 64ead30..f20f00c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.c
@@ -60,17 +60,14 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUPOWERMGMTMULTISOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ GetNextEvent (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.h
index 54be9bc..e4fa11d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtMultiSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.c
index cb22e7a..1af564e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -58,22 +58,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUPOWERMGMTSINGLESOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.h
index 79ac7af..d14794c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSingleSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSystemTables.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSystemTables.h
index 018be2a..dd4f62b 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSystemTables.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuPowerMgmtSystemTables.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define PM_EXEFLAGS_WARM_ONLY    0x00000001   /* Skip step if set && cold reset */
@@ -61,7 +59,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID F_PM_STEP_FUNCTION (
@@ -83,7 +80,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuRegisters.h
index 6a28087..e61c272 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuRegisters.h
@@ -57,7 +57,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
@@ -321,7 +320,6 @@ typedef struct {
 /*
  * --------------------------------------------------------------------------------------
  *
- *             D E F I N E S    /   T Y P E D E F S   /  S T R U C T U R E S
  *
  * --------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuServices.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuServices.h
index 6ddda99..6edf356 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuServices.h
@@ -46,12 +46,10 @@
 #define _CPU_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
  /// WARM RESET STATE_BITS
@@ -61,7 +59,6 @@
 #define WR_STATE_POST  03
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -85,7 +82,6 @@ typedef struct _WARM_RESET_REQUEST {
   UINT8             Reserved:(8-3);                     ///< Reserved
 } WARM_RESET_REQUEST;
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuWarmReset.c
index e8f01d1..03c5bac 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/cpuWarmReset.c
@@ -54,22 +54,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_CPUWARMRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -125,7 +121,6 @@ GetWarmResetFlag (
   FamilySpecificServices->GetWarmResetFlag (FamilySpecificServices, StdHeader, Request);
 }
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.c
index b5be972..37b026c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_CPU_HEAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -80,7 +77,6 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.h b/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.h
index 81f784c..6bf1664 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/CPU/heapManager.h
@@ -46,13 +46,11 @@
 #define _HEAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define AMD_END_OF_NODE             0x5F4F4E45  // _EON - END OF NODE
@@ -102,7 +100,6 @@
 #define AMD_MTRR_FIX4K_WT_DRAM   0x1C1C1C1C1C1C1C1Cull
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Allocate Heap Parameters
@@ -182,7 +179,6 @@ typedef enum {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEarly.c
index ed15410..68bfce4 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEarly.c
@@ -62,13 +62,11 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDINITEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitExeCacheMap[] =
@@ -79,13 +77,11 @@ EXECUTION_CACHE_REGION InitExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEnv.c
index 566eb16..92bfc82 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitEnv.c
@@ -57,25 +57,21 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDINITENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitLate.c
index d9318d5..78d044c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitLate.c
@@ -59,26 +59,22 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDINITLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 extern OPTION_SLIT_CONFIGURATION   OptionSlitConfiguration; // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitMid.c
index 4f614cd..61c8147 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitMid.c
@@ -56,25 +56,21 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDINITMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitPost.c
index 4aec160..507530c 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitPost.c
@@ -62,25 +62,21 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDINITPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitRecovery.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitRecovery.c
index 169e09c..ba3ec3a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitRecovery.c
@@ -59,12 +59,10 @@
 #define FILECODE PROC_COMMON_AMDINITRECOVERY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitReset.c
index 0ea3a7f..89ec16d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitReset.c
@@ -57,13 +57,11 @@
 #define FILECODE PROC_COMMON_AMDINITRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST OPTION_HT_INIT_RESET HtOptionInitReset;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitResetExeCacheMap[] =
@@ -74,13 +72,11 @@ EXECUTION_CACHE_REGION InitResetExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitResume.c
index 4e059cf..a3a8e74 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdInitResume.c
@@ -63,25 +63,21 @@
 #include "cpuFeatures.h"
 #define FILECODE PROC_COMMON_AMDINITRESUME_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdLateRunApTask.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdLateRunApTask.c
index 5bb58af..27fd6f8 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdLateRunApTask.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdLateRunApTask.c
@@ -54,25 +54,21 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDLATERUNAPTASK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE ApDispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3LateRestore.c
index 89b323e..4238d00 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3LateRestore.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_AMDS3LATERESTORE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -80,7 +77,6 @@ AmdS3LateRestorePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3Save.c
index a2dd948..fd25759 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/AmdS3Save.c
@@ -60,13 +60,11 @@
 #include "Topology.h"
 #define FILECODE PROC_COMMON_AMDS3SAVE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT32 ROMDATA S3LateHeapTable[] =
@@ -83,7 +81,6 @@ CONST UINT32 ROMDATA S3LateHeapTable[] =
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -93,7 +90,6 @@ AmdS3SavePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f10/Proc/Common/CommonInits.c
index b145909..ee15e2d 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/CommonInits.c
@@ -51,24 +51,20 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_COMMONINITS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f10/Proc/Common/CreateStruct.c
index 768c7ba..baa5fa3 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/CreateStruct.c
@@ -54,24 +54,20 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_CREATESTRUCT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST FUNCTION_PARAMS_INFO FuncParamsInfo[];
 extern CONST UINTN InitializerCount;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f10/Proc/Common/S3RestoreState.c
index 3d98b38..de9ad2a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/S3RestoreState.c
@@ -57,18 +57,15 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_S3RESTORESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f10/Proc/Common/S3SaveState.c
index 730a36a..8d24b7a 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Common/S3SaveState.c
@@ -55,19 +55,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_COMMON_S3SAVESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/IDS/IdsLib.h b/src/vendorcode/amd/agesa/f10/Proc/IDS/IdsLib.h
index fb686c5..6a65f4e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/IDS/IdsLib.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/IDS/IdsLib.h
@@ -115,7 +115,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f10/Proc/Mem/Main/mu.c
index c31d794..a473306 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Mem/Main/mu.c
@@ -62,17 +62,14 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +109,6 @@ AlignPointerTo16Byte (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.c b/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.c
index 016b757..a6b080e 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.c
+++ b/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.c
@@ -53,22 +53,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_CPU_CPURECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.h b/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.h
index 788eb1a..74c69a9 100644
--- a/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.h
+++ b/src/vendorcode/amd/agesa/f10/Proc/Recovery/CPU/cpuRecovery.h
@@ -46,22 +46,18 @@
 #define _CPU_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/GeneralServices.h b/src/vendorcode/amd/agesa/f12/Include/GeneralServices.h
index da0ecf5..d464755 100644
--- a/src/vendorcode/amd/agesa/f12/Include/GeneralServices.h
+++ b/src/vendorcode/amd/agesa/f12/Include/GeneralServices.h
@@ -47,12 +47,10 @@
 #define _GENERAL_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NUMBER_OF_EVENT_DATA_PARAMS 4
@@ -64,7 +62,6 @@
 #define AMD_DEV_VEN_ID_ADDRESS 0
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct {
 } AGESA_EVENT;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/GnbInterfaceStub.h b/src/vendorcode/amd/agesa/f12/Include/GnbInterfaceStub.h
index 46dc7b6..c760fe3 100644
--- a/src/vendorcode/amd/agesa/f12/Include/GnbInterfaceStub.h
+++ b/src/vendorcode/amd/agesa/f12/Include/GnbInterfaceStub.h
@@ -49,19 +49,16 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f12/Include/OptionDmi.h
index 7458a2c..fcfb983 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionDmi.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionDmi.h
@@ -45,18 +45,15 @@
 #define _OPTION_DMI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct  {
 } OPTION_DMI_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionFamily12hEarlySample.h b/src/vendorcode/amd/agesa/f12/Include/OptionFamily12hEarlySample.h
index 1da86be..f6cfba1 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionFamily12hEarlySample.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionFamily12hEarlySample.h
@@ -48,19 +48,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /**
@@ -130,7 +127,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionGfxRecovery.h b/src/vendorcode/amd/agesa/f12/Include/OptionGfxRecovery.h
index 6ef39b4..43c3a49 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionGfxRecovery.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionGfxRecovery.h
@@ -45,18 +45,15 @@
 #define _OPTION_GFX_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,7 +70,6 @@ typedef struct  {
 } OPTION_GFX_RECOVERY_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionGnb.h b/src/vendorcode/amd/agesa/f12/Include/OptionGnb.h
index e54395b..1cb5e10 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionGnb.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionGnb.h
@@ -45,18 +45,15 @@
 #define _OPTION_GNB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -98,7 +95,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f12/Include/OptionMemory.h
index 5349269..6d2f12d 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionMemory.h
@@ -51,19 +51,16 @@
 #include "ma.h"
 #include "mp.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MAX_FF_TYPES      6   ///< Maximum number of DDR Form factors (UDIMMs, RDIMMMs, SODIMMS) supported
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -307,7 +304,6 @@ typedef struct _MEM_PSC_FLOW_BLOCK {
 } MEM_PSC_FLOW_BLOCK;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 /* Feature Default Return */
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMultiSocket.h b/src/vendorcode/amd/agesa/f12/Include/OptionMultiSocket.h
index eebf6b3..cfa7792 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionMultiSocket.h
@@ -45,18 +45,15 @@
 #define _OPTION_MULTISOCKET_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -176,7 +173,6 @@ typedef struct  {
 } OPTION_MULTISOCKET_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f12/Include/OptionPstate.h
index aa6d68c..33b136a 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionPstate.h
@@ -47,17 +47,14 @@
 #include "cpuPstateTables.h"
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -108,7 +105,6 @@ typedef struct  {
 } OPTION_PSTATE_LATE_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f12/Include/OptionSlit.h
index b03f18c..e779c3d 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionSlit.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionSlit.h
@@ -45,18 +45,15 @@
 #define _OPTION_SLIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +85,6 @@ typedef struct  {
 } OPTION_SLIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f12/Include/OptionSrat.h
index 4d3a1c0..460d4ef 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionSrat.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionSrat.h
@@ -45,18 +45,15 @@
 #define _OPTION_SRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +71,6 @@ typedef struct  {
 } OPTION_SRAT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f12/Include/OptionWhea.h
index d1cc37b..61f8a3f 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionWhea.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionWhea.h
@@ -45,18 +45,15 @@
 #define _OPTION_WHEA_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +72,6 @@ typedef struct  {
 } OPTION_WHEA_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f12/Include/OptionsHt.h
index 7d578b0..5608ccd 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionsHt.h
+++ b/src/vendorcode/amd/agesa/f12/Include/OptionsHt.h
@@ -46,18 +46,15 @@
 #define _OPTION_HT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -102,7 +99,6 @@ typedef struct {
 } OPTION_HT_INIT_RESET;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/agesa/f12/Include/PlatformMemoryConfiguration.h
index 0440765..6f1edbf 100644
--- a/src/vendorcode/amd/agesa/f12/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/agesa/f12/Include/PlatformMemoryConfiguration.h
@@ -45,7 +45,6 @@
 #define _PLATFORM_MEMORY_CONFIGURATION_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #ifndef PSO_ENTRY
@@ -53,11 +52,9 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c
index cbbd491..6999c7d 100644
--- a/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c
@@ -56,7 +56,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LEGACY_PROC_DISPATCHER_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE DispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f12/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f12/Legacy/Proc/agesaCallouts.c
index 2241ed7..044ac61 100644
--- a/src/vendorcode/amd/agesa/f12/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f12/Legacy/Proc/agesaCallouts.c
@@ -59,28 +59,23 @@
 
 #define FILECODE LEGACY_PROC_AGESACALLOUTS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c
index bf8e6d2..245a2ed 100644
--- a/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f12/Legacy/Proc/hobTransfer.c
@@ -63,18 +63,15 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE LEGACY_PROC_HOBTRANSFER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +81,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Lib/amdlib.c b/src/vendorcode/amd/agesa/f12/Lib/amdlib.c
index 9ce10b6..8b1a7b7 100644
--- a/src/vendorcode/amd/agesa/f12/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f12/Lib/amdlib.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LIB_AMDLIB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ LibAmdGetDataFromPtr (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f12/Lib/amdlib.h b/src/vendorcode/amd/agesa/f12/Lib/amdlib.h
index 5225dce..49bf707 100644
--- a/src/vendorcode/amd/agesa/f12/Lib/amdlib.h
+++ b/src/vendorcode/amd/agesa/f12/Lib/amdlib.h
@@ -46,7 +46,6 @@
 #define _AMD_LIB_H_
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define IOCF8 0xCF8
@@ -62,17 +61,14 @@
 #define    DR7_REG  0x17
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10InitEarlyTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10InitEarlyTable.c
index 2190f55..0bc3561 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10InitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10InitEarlyTable.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10IoCstate.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10IoCstate.c
index ae68a83..6106442 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10IoCstate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10IoCstate.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10IOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -75,13 +74,11 @@ F10InitializeIoCstateOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            IoCstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
index 13f0aba..87de28e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10MULTILINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PackageType.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PackageType.h
index 76af9ac..22a30e5 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PackageType.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PackageType.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -70,13 +68,11 @@
 #define PACKAGE_TYPE_S1G4                   PACKAGE_TYPE_S1G3_S1G4
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
index 394e15c..ce1748f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMASYMBOOSTINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ SetAsymBoost (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
index 24e99af..f5e7421 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
index 0e8a532..c787637 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMDUALPLANEONLYSUPPORT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -84,7 +81,6 @@ SetPstateMSR (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
index 941bcf4..44123ff 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
index 63e9232..0ee939e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
@@ -65,12 +65,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBCOFVIDINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for performing the steps outlined in
@@ -81,7 +79,6 @@ typedef struct {
 } NB_COF_VID_INIT_WARM;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -99,7 +96,6 @@ PmNbCofVidInitWarmCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
index ab10da6..aa99588 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
index 19a8217..ec48d58 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
@@ -62,12 +62,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBPSTATEINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for modifying the P-state
@@ -78,7 +76,6 @@ typedef struct {
 } NB_PSTATE_INIT;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -89,7 +86,6 @@ PmNbPstateInitCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
index 652f2fb..d794f79 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
index 74481a3..91a0708 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10SINGLELINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
index 182a554..3e7d9d9 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
@@ -74,7 +74,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
index 0851500..128033a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
index c33f8a9..1b08811 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
index 72e29cf..4ba49da 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
index 5392f4f..e1cabaa 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
@@ -56,17 +56,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES ROMDATA *CpuF10BlMicroCodePatchArray[];
@@ -74,7 +71,6 @@ extern CONST UINT8 ROMDATA CpuF10BlNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
index 660f653..f6ac131 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10BlMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
index 7ed16aa..bda0da1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
index fd32024..1f1e4e3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
@@ -75,7 +75,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
index 6fd6b6f..f8ecb47 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
index bdbb09c..c8f43d0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
index ca1e6dc..a76f322 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DALOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
index 6d1b2df..65008a5 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
index 99e0b58..5ffe8af 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10DaMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
index 26aab9b..08ded68 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
index 225fda5..485c7e0b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
@@ -51,12 +51,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1026,11 +1024,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch01000085 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
index 07e89d6..090c653 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
@@ -51,12 +51,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1026,11 +1024,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c6 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
index b8fb5ff..b7509d7 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
@@ -51,12 +51,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1026,11 +1024,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c7 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
index 2807a5d..71c7e50 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
@@ -51,12 +51,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1026,11 +1024,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c8 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
index fb7fc89..cf3aeb0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
index 3400e2a..8a7c133 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -80,7 +77,6 @@ F10InitializeHwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
index 2fbe6e5..f1963d4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevCMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
index f1b6cd5..ce28988 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
index 898de9f..3511c50 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCSWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -79,7 +76,6 @@ F10InitializeSwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
index 407db95..7e06c4a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
@@ -62,22 +62,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
index a254928..44076e4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
index bf98025..fddce30 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
index ad356b1..45e23c2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
index ab45bda..e4d08f9 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
index 6d2dc23..07b20e4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RbMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
index f4801b9..4505c85 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
index 6080214..71f0429 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
@@ -53,12 +53,10 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c4 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
index c2317a4..a3e586a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
@@ -53,12 +53,10 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c5 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
index a52ff50..f0321ba 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDMSGBASEDC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -91,7 +88,6 @@ IsDramScrubberEnabled (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
index 482af86..0653d68 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
@@ -62,22 +62,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
index 8a6bdc4..7700b12 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF10HyMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
index ffb8572..0bb606d 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
index e9b5820..bada89f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
index 7f5148a..98cf1f0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
index 3cae4f7..14f6d63 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
@@ -55,12 +55,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -69,12 +67,10 @@ extern CONST MICROCODE_PATCHES ROMDATA *CpuF10HyMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF10HyNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
index 1dcf3b1..c611202 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10HyMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
index 58abbac..b60378e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
index 3f25ddb..40f2f16 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
@@ -53,12 +53,10 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000bf =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
index e482827..4fef632 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
index c8126a0..b416964 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevEMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
index 4d90f28..c4e940c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
index d1210e1..90146a9 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
@@ -62,22 +62,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
index 1fe908d..c56622b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF10PhMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
index 1314362..7e0b493 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
index faa0645..8127ecb 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
@@ -53,22 +53,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
index d6d3417..c1da173 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
@@ -55,12 +55,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -69,12 +67,10 @@ extern CONST UINT8 ROMDATA CpuF10PhNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
index 4ee194f..29e78df 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
@@ -61,12 +61,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUCOMMONF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /**
@@ -87,12 +85,10 @@ typedef union {
 } NODE_ID_MSR;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
index 489230f..ce48734 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandId.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandId.c
index 401b082..0339367 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandId.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandId.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10BRANDID_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_BRAND_TABLE *F10BrandIdString1Tables[];
@@ -81,7 +77,6 @@ extern CONST UINT8 F10BrandIdString1TableCount;
 extern CONST UINT8 F10BrandIdString2TableCount;
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
index f7604e6..637e5d3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
@@ -53,22 +53,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -187,7 +183,6 @@ CONST CHAR8 ROMDATA str2_F10_Am3_SC_0T[] = "0T Processor";
 CONST CHAR8 ROMDATA str2_F10_Am3_SC_5T[] = "5T Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
index 6a23f09..d0c6df7 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +85,6 @@ CONST CHAR8 ROMDATA str_F10_Asb2_L_Dual_Core_Processor[] = "L Dual-Core Processo
 CONST CHAR8 ROMDATA str_F10_Asb2_H_Dual_Core_Processor[] = "H Dual-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
index dd38b2c..79cbcfc 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +86,6 @@ CONST CHAR8 ROMDATA str2_F10_C32_GL_EE[] = "GL EE";
 CONST CHAR8 ROMDATA str2_F10_C32_CL_EE[] = "CL EE";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
index 62c9b46..a1dff17 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
@@ -53,22 +53,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +108,6 @@ CONST CHAR8 ROMDATA str2_F10_Fr1207_KS_HE[] = "KS HE";
 CONST CHAR8 ROMDATA str2_F10_Fr1207_QCP[] = " Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
index 8ce3763..4d6d7ee 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
@@ -53,22 +53,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +83,6 @@ CONST CHAR8 ROMDATA str2_F10_G34_KS[] = "KS";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
index 46330ca..ebf4045 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
@@ -53,22 +53,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -92,7 +88,6 @@ CONST CHAR8 ROMDATA str_F10_S1g3_Athlon_II_DC_M3[] = "AMD Athlon(tm) II Dual-Cor
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
index 79d92ef..71e18a5 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
@@ -53,22 +53,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +85,6 @@ CONST CHAR8 ROMDATA str_F10_S1g4_0_Triple_Core_Processor[] = "0 Triple-Core Proc
 CONST CHAR8 ROMDATA str_F10_S1g4_0_Quad_Core_Processor[] = "0 Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
index b9bd763..85d5134 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CACHEDEFAULTS_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define BSP_STACK_SIZE            16384
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
index feb9e23..e55e31b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
@@ -74,7 +74,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Cpb.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Cpb.c
index 8b55a38..a1de94e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Cpb.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Cpb.c
@@ -62,22 +62,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Dmi.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Dmi.c
index 1b2a19b..cf92acc 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Dmi.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Dmi.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10DMI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,7 +79,6 @@ F10Translate7BitVidTo6Bit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
index 5b8280c..bfa0017 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
@@ -63,12 +63,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10EARLYINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Enum for handling code branching while transitioning to the
@@ -81,7 +79,6 @@ typedef enum {
 } GO_TO_STEP;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ WaitForCpuFidAndDidToMatch (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
index 94cc025..8b96797 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
index 704dd74..beb318b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10FEATURELEVELING_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -87,7 +84,6 @@ updateCpuFeatureList (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
index 32b1e98..4a76308 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
@@ -48,19 +48,16 @@
 #include "cpuFamilyTranslation.h"
 #include "cpuPostInit.h"
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// F10 CPU Feature Low
@@ -175,7 +172,6 @@ typedef struct {
   CPU_F10_EXT_FEATURES_HI CpuF10ExtFeaturesHi;  ///< High
 } CPU_F10_EXT_FEATURES;
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
index 0e30770..a837f25 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10HTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10MsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10MsrTables.c
index 97d82df..4fa28d3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10MsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10MsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PciTables.c
index 02af745..64208a0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
index 1598996..ccb6f43 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ F10PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
index 1bd22d6..791179a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -69,7 +66,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
index e657902..4a258dc 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
@@ -66,22 +66,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
index 54cccae..59fca3f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
@@ -66,7 +66,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -105,12 +104,10 @@ CONST UINT32 ROMDATA AltvidSlamTime[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -139,7 +136,6 @@ F10PmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
index 900208f..0517efc 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Pstate.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Pstate.c
index d5bc4e5..f0e1ebb 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Pstate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Pstate.c
@@ -63,12 +63,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -96,12 +94,10 @@ F10GetFrequencyXlatRegInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
index 075cb73..a6d6a73 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
@@ -59,22 +59,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10SOFTWARETHERMAL_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
index 2e7ab7a..22ead4e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.c
index 7d82754..564094e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Register encodings for F3xD8[VSRampTime/VSSlamTime]
@@ -84,17 +83,14 @@ CONST UINT32 ROMDATA VSSlamTime[8] =
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.h
index 1ef97a3..24b0c7b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10Utilities.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -70,7 +67,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
index 6d486ad..c08b7f1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WHEAINITDATATABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F10HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
index 176f5aa..93b7130 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WORKAROUNDSTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12C6State.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12C6State.c
index b7c7f76..43bd31b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12C6State.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12C6State.c
@@ -61,23 +61,19 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_F12C6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F12_ES_C6_SUPPORT F12EarlySampleC6Support;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12Cpb.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12Cpb.c
index ba4d4e7..96b3872 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12Cpb.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12Cpb.c
@@ -62,23 +62,19 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_F12CPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //extern F12_ES_CPB_SUPPORT F12EarlySampleCpbSupport;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12IoCstate.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12IoCstate.c
index 7e7b089..e422b58 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12IoCstate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12IoCstate.c
@@ -66,7 +66,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_F12IOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +76,6 @@ F12InitializeIoCstateOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c
index f8ece1a..888f4ca 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF12MicrocodePatch03000002 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c
index 08f88c3..4d4d785 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF12MicrocodePatch0300000e =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c
index b4c8921..fe54d60 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c
@@ -50,12 +50,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1025,11 +1023,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF12MicrocodePatch0300000f =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12PackageType.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12PackageType.h
index 098bbe0..aed477e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12PackageType.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12PackageType.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -62,13 +60,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnEquivalenceTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnEquivalenceTable.c
index 84edcac..31022a6 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnEquivalenceTable.c
@@ -53,17 +53,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_LN_F12LNEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -75,7 +72,6 @@ GetF12LnMicrocodeEquivalenceTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnLogicalIdTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnLogicalIdTables.c
index 4e88e59..b90ec2e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnLogicalIdTables.c
@@ -53,17 +53,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_LN_F12LNLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -75,7 +72,6 @@ GetF12LnLogicalIdAndRev (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnMicrocodePatchTables.c
index 8dc7244..bc17159 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/LN/F12LnMicrocodePatchTables.c
@@ -55,12 +55,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_LN_F12LNMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES ROMDATA *CpuF12LnMicroCodePatchArray[];
@@ -68,7 +66,6 @@ extern CONST UINT8 ROMDATA CpuF12LnNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -80,7 +77,6 @@ GetF12LnMicroCodePatchesStruct (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.c
index 59fb1d9..28e50f7 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.c
@@ -65,14 +65,12 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUCOMMONF12UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F12_ES_CORE_SUPPORT F12EarlySampleCoreSupport;
 #define F12_DDR1333_ENCODED_MEMCLK (0xE)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT16 ROMDATA F12MaxNbFreqAtMinVidFreqTable[] =
@@ -112,7 +110,6 @@ CONST UINT16 ROMDATA F12MaxNbFreqAtMinVidFreqTable[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -135,7 +132,6 @@ F12CpuAmdCoreIdPositionInInitialApicId (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.h
index 8f8f32d..7845dda 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuCommonF12Utilities.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandId.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandId.c
index 5184d23..ff61867 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandId.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandId.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12BRANDID_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_BRAND_TABLE *F12BrandIdString1Tables[];
@@ -81,7 +77,6 @@ extern CONST UINT8 F12BrandIdString1TableCount;
 extern CONST UINT8 F12BrandIdString2TableCount;
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFm1.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFm1.c
index 8711d68..ceb094c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFm1.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFm1.c
@@ -52,22 +52,18 @@
 #include "F12PackageType.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -132,7 +128,6 @@ CONST CHAR8 ROMDATA str_F12_Fm1_0_QC_Processor[] = "0 Quad-Core Processor";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFs1.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFs1.c
index 372ae4c..54ab74c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFs1.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12BrandIdFs1.c
@@ -52,22 +52,18 @@
 #include "F12PackageType.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -101,7 +97,6 @@ CONST CHAR8 ROMDATA str_F12_Fs1_MG_QC_Processor[] = "MG Quad-Core Processor";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12CacheDefaults.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12CacheDefaults.c
index 900c82b..bcdf5f8 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12CacheDefaults.c
@@ -55,17 +55,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12CACHEDEFAULTS_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ GetF12CacheInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define BSP_STACK_SIZE            16384
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Dmi.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Dmi.c
index 227ceca..627b3a5 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Dmi.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Dmi.c
@@ -59,18 +59,15 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12DMI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -101,7 +98,6 @@ DmiF12GetMemInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.c
index 0bf4c69..01ae3b7 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12EARLYNBPSTATEINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.h
index 2691231..a1b8259 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12EarlyNbPstateInit.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12MsrTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12MsrTables.c
index 7d47641..3fe4314 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12MsrTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12MsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F12MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PciTables.c
index d6ebb89..a310439 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PciTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PerCorePciTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PerCorePciTables.c
index 56ab032..dd61f1f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PerCorePciTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PerCorePciTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12PERCOREPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.c
index d96f6ec..7ad2980 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ F12PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.h
index f044217..29e190a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerCheck.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -68,7 +65,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerMgmtSystemTables.c
index 3ca62c2..62dcf63 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerMgmtSystemTables.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12POWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ GetF12SysPmTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.c
index a14cb1b..da2da21 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12POWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F12_ES_CORE_SUPPORT F12EarlySampleCoreSupport;
@@ -84,12 +83,10 @@ STATIC CONST UINT32 ROMDATA F12VSRampSlamWaitTimes[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -103,7 +100,6 @@ F12PmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.h
index d071c73..fc321b3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12PowerPlane.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Pstate.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Pstate.c
index 8b4fbd5..a6da2e2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Pstate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Pstate.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12PSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -120,7 +117,6 @@ F12GetPstateRegisterInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.c
index 08be5d1..99c7045 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12SOFTWARETHERMAL_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -79,7 +76,6 @@ F12PmThermalInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.h
index 1945c01..3ef75c1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12SoftwareThermal.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.c
index 8fe9298..ec0d325 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.c
@@ -63,18 +63,15 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -118,7 +115,6 @@ F12GetNumberOfPhysicalCores (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.h
index 3daf790..caef16f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12Utilities.h
@@ -47,24 +47,20 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12WheaInitDataTables.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12WheaInitDataTables.c
index b4c22dc..534402d 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/cpuF12WheaInitDataTables.c
@@ -54,17 +54,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X12_CPUF12WHEAINITDATATABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -76,7 +73,6 @@ GetF12WheaInitData (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F12HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/cpuFamRegisters.h
index db4e7ad..7f33c55 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/cpuFamRegisters.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/cpuFamRegisters.h
@@ -56,7 +56,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.c
index 35705b2..00caec2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.c
@@ -66,22 +66,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_PRESERVEMAILBOX_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PreserveMailboxFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.h
index 987bd9d..c58e5ea 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/PreserveMailbox.h
@@ -47,7 +47,6 @@
 #define _PRESERVE_MAILBOX_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #define MAX_PRESERVE_REGISTER_ENTRIES 2      ///< There is room on the heap for up to this per node.
@@ -56,12 +55,10 @@
 typedef UINT32 (*MAILBOX_REGISTER_SAVE_ENTRY) [MAX_PRESERVE_REGISTER_ENTRIES];
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.c
index 262867c..3baef27 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ EnableC6OnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE C6FamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.h
index 7a163b1..afeef19 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuC6State.h
@@ -46,19 +46,16 @@
 #define _CPU_C6_STATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (C6_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index 6a0bb52..5f9f1b3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -78,7 +78,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CacheFlushOnHaltFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCoreLeveling.c
index 27537d6..e9f6f12 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -79,7 +79,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CoreLevelingFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.c
index fdad8cc..ca88d3c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpbFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.h
index 2dde5d8..468536e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuCpb.h
@@ -46,19 +46,16 @@
 #define _CPU_CPB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPB_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c
index 5661291..5c05da6 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuDmi.c
@@ -61,18 +61,15 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUDMI_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
@@ -90,7 +87,6 @@ IntToString (
 );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatureLeveling.c
index 47afc5d..d43c9a0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.c
index 7f80562..8093bd3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 extern CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[];
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.h
index 79be036..da11585 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuFeatures.h
@@ -141,17 +141,14 @@
 
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 #define CPU_FEAT_BEFORE_PM_INIT           (0x0000000000000001ull)
@@ -240,7 +237,6 @@ typedef struct {
 } CPU_FEATURE_TABLE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.c
index 6106d14..91a861a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUHWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE HwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.h
index f6bfafe..205ca8b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuHwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_HW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.c
index c9a42ce..43fe680 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +81,6 @@ EnableIoCstateOnSocket (
   IN       AMD_CPU_EARLY_PARAMS *CpuEarlyParams
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE    IoCstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.h
index 27e1a1b..bd3649d 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuIoCstate.h
@@ -45,14 +45,12 @@
 #define _CPU_IO_CSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Defines for ACPI C-State Objects
@@ -75,7 +73,6 @@ AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 #define   CSD_COORD_TYPE_HW_ALL 0xFE
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /* AML code definition */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuL3Features.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuL3Features.h
index f6f8d7d..c901b7f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuL3Features.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuL3Features.h
@@ -47,21 +47,18 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (L3_FEATURE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_DISABLE_CACHE (0x00000000 | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 #define AP_LATE_TASK_ENABLE_CACHE  (0x00010000 | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 #define L3_SCRUBBER_CONTEXT_ARRAY_SIZE 4
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.c
index 310d152..a23a89a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPULOWPWRPSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -83,7 +80,6 @@ EnableLowPwrPstateOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE LowPwrPstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.h
index c06e169..77da750 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuLowPwrPstate.h
@@ -46,19 +46,16 @@
 #define _CPU_LOW_PWR_PSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (LOW_PWR_PSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.c
index ab1a5ae..0e01624 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUMSGBASEDC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ EnableMsgC1eOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE MsgBasedC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.h
index 76457a9..145db2c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuMsgBasedC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_MSG_BASED_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MSG_BASED_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuPstateTables.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuPstateTables.h
index 0ff7585..d25d580 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuPstateTables.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuPstateTables.h
@@ -46,19 +46,16 @@
 #define _CPU_PSTATE_TABLES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSTATE_CPU_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// P-state structure for each state
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSlit.c
index dd414f1..973e031 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSlit.c
@@ -69,7 +69,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSLIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,12 +88,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuSlitHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -105,13 +102,11 @@ AcpiSlitHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSrat.c
index 8a59886..3cd7d8c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSrat.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config record
@@ -74,7 +73,6 @@ extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config
 #define FOURGB 0x010000
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -99,7 +97,6 @@ STATIC CPU_SRAT_HEADER  ROMDATA CpuSratHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
@@ -131,7 +128,6 @@ STATIC
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.c
index 7282832..cb09ad0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE SwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.h
index 1810eb5..96c3cac 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuSwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_SW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (SW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuWhea.c
index bdef5ba..4ecdf38 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Feature/cpuWhea.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUWHEA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 extern OPTION_WHEA_CONFIGURATION OptionWheaConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ CreateHestBank (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c
index caf817e..0897309 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c
@@ -62,19 +62,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_S3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -150,7 +147,6 @@ RestoreConditionalMsrDevice (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.h
index f3171ae..061dbfd 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.h
@@ -46,19 +46,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define RESTART_FROM_BEGINNING_LIST 0xFFFFFFFF
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -316,7 +313,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/Table.c
index b6c6947..65e91f4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/Table.c
@@ -69,22 +69,18 @@ RDATA_GROUP (G1_PEICC)
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cahalt.c
index 1bad891..b5f386a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cahalt.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 
  /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 // typedef unsigned int   uintptr_t;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ ExecuteWbinvdInstruction (
   );
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c
index 06a1d7b..3255252 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.c
@@ -63,7 +63,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUAPICUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /* ApFlags bits */
@@ -76,7 +75,6 @@ RDATA_GROUP (G1_PEICC)
 #define XFER_ELEMENT_SIZE    sizeof (UINT32)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -86,7 +84,6 @@ typedef VOID F_CPU_AMD_NMI_HANDLER (
 typedef F_CPU_AMD_NMI_HANDLER *PF_CPU_AMD_NMI_HANDLER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -171,7 +168,6 @@ LocalApicInitializationAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.h
index 59b836a..d395b4b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuApicUtilities.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define APIC_CTRL_DWORD 0xF
@@ -115,7 +113,6 @@
 #define IDT_DESC_TYPE_INT32  0x0E
 #define IDT_DESC_TYPE_TRAP32 0x0F
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID (*PF_AP_TASK) (AMD_CONFIG_PARAMS *StdHeader);
@@ -189,7 +186,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 //                   These are   P U B L I C   functions, used by AGESA
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBist.c
index a86aa2e..d53d5c8 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBist.c
@@ -59,7 +59,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBIST_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +69,6 @@ GetBistResults (
   );
 
  /*----------------------------------------------------------------------------------------
-  *                          E X P O R T E D    F U N C T I O N S
   *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBrandId.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBrandId.c
index a335139..2a23215 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBrandId.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuBrandId.c
@@ -59,12 +59,10 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBRANDID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA strEngSample[] = "AMD Engineering Sample";
@@ -78,12 +76,10 @@ CONST AMD_CPU_BRAND ROMDATA Dflt_Str2 = {0, 0, 0, SOCKET_IGNORE, DR_NO_STRING, D
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.c
index 5a3e4eb..372c899 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -99,7 +96,6 @@ GetPerformEarlyFlag (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.h
index 0cda4ad..4dbaad0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEarlyInit.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -87,7 +85,6 @@ AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 #define MICROCODE_PATCH_2K_SIZE    2048
 #define MICROCODE_PATCH_4K_SIZE    4096
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -217,7 +214,6 @@ struct _CPU_CORE_LEVELING_FAMILY_SERVICES {             // See Forward Declarati
 
 #define PERFORM_EARLY_ANY_CONDITION 0xFFFFFFFF // the related function always needs to be run
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEnvInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEnvInit.h
index 2d13b5d..8319442 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEnvInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEnvInit.h
@@ -46,22 +46,18 @@
 #define _CPU_ENV_INIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 // HobTransfer
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEventLog.c
index f802542..016dc93 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuEventLog.c
@@ -57,13 +57,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUEVENTLOG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define TOTAL_EVENT_LOG_BUFFERS  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +85,6 @@ typedef struct {
 } AGESA_STRUCT_BUFFER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.c
index 3884cd7..479b315 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.c
@@ -59,12 +59,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUFAMILYTRANSLATION_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +110,6 @@ CONST CPU_SPECIFIC_SERVICES ROMDATA cpuNullServices =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -125,7 +122,6 @@ GetCpuServices (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpuSupportedFamiliesTable;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.h
index a0f2609..6137a69 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuFamilyTranslation.h
@@ -129,7 +129,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 #include "cpuPostInit.h"
@@ -142,12 +141,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (CPU_SPECIFIC_SERVICES);
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -895,7 +892,6 @@ typedef struct {
 } CPU_FAMILY_ID_XLAT_TABLE;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuGeneralServices.c
index 7d62d9f..e098f51 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuGeneralServices.c
@@ -64,24 +64,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUGENERALSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTIONS_CONFIG_TOPOLOGY TopologyConfiguration;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 
@@ -185,7 +181,6 @@ AmdIdentifyCore (
 }
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - AGESA common General Services
  *----------------------------------------------------------------------------------------
  */
 
@@ -316,7 +311,6 @@ IdentifyCore (
 
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - cpu component General Services
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuInitEarlyTable.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuInitEarlyTable.c
index 0883d20..ecd8827 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuInitEarlyTable.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.c
index 618a4a6..7230517 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_CPULATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ DisableCf8ExtCfg (
   IN       AMD_CONFIG_PARAMS   *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.h
index 29f4070..e49a593 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuLateInit.h
@@ -50,12 +50,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (PROC_FAMILY_TABLE);
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -319,7 +317,6 @@ AGESA_FORWARD_DECLARATION (PROC_FAMILY_TABLE);
 #define     PSTATE_FLAG_2           0xAA
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -776,7 +773,6 @@ typedef struct _CPU_SRAT_MEMORY_ENTRY {
 } CPU_SRAT_MEMORY_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c
index 5968c25..a01aa70 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuMicrocodePatch.c
@@ -60,13 +60,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUMICROCODEPATCH_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -75,7 +73,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -108,7 +105,6 @@ GetMicrocodeVersion (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c
index 59ff265..4b5e5da 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.c
@@ -70,17 +70,14 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUPOSTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -102,7 +99,6 @@ SyncAllApMtrrToBsc (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.h
index 4fd5781..7ed9139 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPostInit.h
@@ -47,20 +47,17 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPU_CFOH_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define P_STATE_DATA_GATHER_TEMP_ADDR     0x200000 ///< Fixed the row data at 2M memory address.
 #define GLOBAL_CPU_FEATURE_LIST_TEMP_ADDR 0x200000 ///< Fixed the row data at 2M memory address.
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -184,7 +181,6 @@ struct _CPU_CFOH_FAMILY_SERVICES {                     // See forward reference
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmt.c
index db7a1d1..347670b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmt.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ GoToMemInitPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.c
index 330f46b..a59b9cb 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTMULTISOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ GetNextEvent (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.h
index caeb96f..ddc982b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtMultiSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.c
index 38d7afa..3fa8ce1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTSINGLESOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.h
index 6dd4c81..1d737fa 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSingleSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSystemTables.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSystemTables.h
index 0adb279..9e26f27 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSystemTables.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuPowerMgmtSystemTables.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define PM_EXEFLAGS_WARM_ONLY    0x00000001   /* Skip step if set && cold reset */
@@ -61,7 +59,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID F_PM_STEP_FUNCTION (
@@ -83,7 +80,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuRegisters.h
index 941f4b6..7a558a2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuRegisters.h
@@ -57,7 +57,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
@@ -356,7 +355,6 @@ typedef struct {
 /*
  * --------------------------------------------------------------------------------------
  *
- *             D E F I N E S    /   T Y P E D E F S   /  S T R U C T U R E S
  *
  * --------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuServices.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuServices.h
index 0d5302e..d975244 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuServices.h
@@ -46,12 +46,10 @@
 #define _CPU_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
  /// WARM RESET STATE_BITS
@@ -61,7 +59,6 @@
 #define WR_STATE_POST  03
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -134,7 +131,6 @@ typedef struct _WARM_RESET_REQUEST {
   UINT8             Reserved:(8-5);                     ///< Reserved
 } WARM_RESET_REQUEST;
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuWarmReset.c
index e812dc4..ead0fff 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/cpuWarmReset.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUWARMRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -143,7 +139,6 @@ GetWarmResetFlag (
   }
 }
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c
index dacaded..4906e91 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_HEAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
@@ -102,7 +99,6 @@ InsertFreeSpaceNode (
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.h b/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.h
index 3afc798..efbaa05 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/heapManager.h
@@ -46,13 +46,11 @@
 #define _HEAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define AMD_MTRR_VARIABLE_BASE0 0x200
@@ -106,7 +104,6 @@
 #define AMD_MTRR_FIX4K_UC_DRAM   0x1818181818181818ull
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Allocate Heap Parameters
@@ -195,7 +192,6 @@ typedef enum {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEarly.c
index daedd9f..5baf82d 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEarly.c
@@ -66,13 +66,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitExeCacheMap[] =
@@ -83,7 +81,6 @@ EXECUTION_CACHE_REGION InitExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -99,7 +96,6 @@ AllocateExecutionCacheInitializer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEnv.c
index c49cd26..38c3ade 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitEnv.c
@@ -64,25 +64,21 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitLate.c
index fb63efb..a0a07fe 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitLate.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDINITLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
@@ -72,13 +71,11 @@ extern OPTION_SLIT_CONFIGURATION   OptionSlitConfiguration; // global user confi
 extern OPTION_PSTATE_LATE_CONFIGURATION OptionPstateLateConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -89,7 +86,6 @@ AmdLatePlatformConfigInit (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitMid.c
index 4ec3f7d..455648a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitMid.c
@@ -63,25 +63,21 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitPost.c
index 23fa606..616a980 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitPost.c
@@ -64,19 +64,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -87,7 +84,6 @@ AmdPostPlatformConfigInit (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitRecovery.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitRecovery.c
index 47fc364..28008e6 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitRecovery.c
@@ -62,12 +62,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_COMMON_AMDINITRECOVERY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitReset.c
index 27eae0e..bc18566 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitReset.c
@@ -67,19 +67,16 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST OPTION_HT_INIT_RESET HtOptionInitReset;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -90,7 +87,6 @@ AmdInitResetExecutionCacheAllocateInitializer (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitResume.c
index 663f07e..e7c7b0b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdInitResume.c
@@ -66,25 +66,21 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITRESUME_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdLateRunApTask.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdLateRunApTask.c
index 0bedc9b..774fdcc 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdLateRunApTask.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdLateRunApTask.c
@@ -57,25 +57,21 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDLATERUNAPTASK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE ApDispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c
index 419e26f..8f16ec4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3LateRestore.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDS3LATERESTORE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -83,7 +80,6 @@ AmdS3LateRestorePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c
index 0770c1e..ed50dea 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/AmdS3Save.c
@@ -67,13 +67,11 @@ RDATA_GROUP (G3_DXE)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT32 ROMDATA S3LateHeapTable[] =
@@ -91,7 +89,6 @@ CONST UINT32 ROMDATA S3LateHeapTable[] =
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -101,7 +98,6 @@ AmdS3SavePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f12/Proc/Common/CommonInits.c
index c12ad55..b7da89e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/CommonInits.c
@@ -56,24 +56,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_COMMONINITS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f12/Proc/Common/CreateStruct.c
index 010536e..944cc17 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/CreateStruct.c
@@ -59,24 +59,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_CREATESTRUCT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST FUNCTION_PARAMS_INFO FuncParamsInfo[];
 extern CONST UINTN InitializerCount;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f12/Proc/Common/S3RestoreState.c
index 7b2056b..33ffd37 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/S3RestoreState.c
@@ -59,19 +59,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_S3RESTORESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 extern S3_SCRIPT_CONFIGURATION    OptionS3ScriptConfiguration;
 extern S3_DISPATCH_FUNCTION_ENTRY S3DispatchFunctionTable[];
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f12/Proc/Common/S3SaveState.c
index e194626..655b648 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Common/S3SaveState.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_S3SAVESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c b/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c
index f8de7ed..d5e7d88 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c
@@ -51,7 +51,6 @@
 #include  "FchPlatform.h"
 #include  "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c b/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c
index f2a7c41..684cbcd 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c
@@ -51,7 +51,6 @@
 #include  "FchPlatform.h"
 #include  "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c b/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c
index 627b54d..767317c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c
@@ -53,7 +53,6 @@
 #define FILECODE PROC_FCH_SATA_FAMILY_HUDSON2_HUDSON2SATAENVSERVICE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c b/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c
index ef57858..71381d2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c
@@ -53,7 +53,6 @@
 #define FILECODE PROC_FCH_SATA_FAMILY_HUDSON2_HUDSON2SATASERVICE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 UINT8  NumOfSataPorts = 8;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/GnbLibFeatures.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/GnbLibFeatures.c
index 29683d1..13505c3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/GnbLibFeatures.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Common/GnbLibFeatures.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define  FILECODE PROC_GNB_COMMON_GNBLIBFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/Family/LN/F12GfxServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/Family/LN/F12GfxServices.c
index 6ece971..1594fae 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/Family/LN/F12GfxServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/Family/LN/F12GfxServices.c
@@ -70,20 +70,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_FAMILY_LN_F12GFXSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxConfigData.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxConfigData.c
index 92cebbe..07b4c6d 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxConfigData.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxConfigData.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXCONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -68,13 +67,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxGmcInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxGmcInit.c
index 5c5ab45..72c4e75 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxGmcInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxGmcInit.c
@@ -64,7 +64,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXGMCINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,14 +77,12 @@ typedef struct {
 } DCT_CHANNEL_INFO;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -167,7 +164,6 @@ GfxGmcInitializePowerGating (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtEnvPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtEnvPost.c
index c9718c7..3fa0c0e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtEnvPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtEnvPost.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATENVPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtMidPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtMidPost.c
index f7ea25b..7211c36 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtMidPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtMidPost.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATMIDPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtPost.c
index 9e1fcff..0edc8e0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxInitAtPost.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
index 93c36e4..d78a248 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
@@ -72,14 +72,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINTEGRATEDINFOTABLEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +85,6 @@
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxLib.c
index e9fb5c0..d96d697 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxLib.c
@@ -60,20 +60,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxRegisterAcc.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxRegisterAcc.c
index ba4e57d..3e0fd4f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxRegisterAcc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxRegisterAcc.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXREGISTERACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxStrapsInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxStrapsInit.c
index c78c7bd..6836938 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxStrapsInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Gfx/GfxStrapsInit.c
@@ -64,20 +64,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXSTRAPSINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEarly.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEarly.c
index d43805f..7c781f4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEarly.c
@@ -57,19 +57,16 @@
 #define FILECODE PROC_GNB_GNBINITATEARLY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEarlyFeatureTable[];
 extern  OPTION_GNB_CONFIGURATION  GnbEarlierFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEnv.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEnv.c
index fc4e41a..a97885b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtEnv.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEnvFeatureTable[];
 extern  BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtLate.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtLate.c
index 9b03303..918c942 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtLate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtLate.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern  OPTION_GNB_CONFIGURATION  GnbLateFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtMid.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtMid.c
index 7a5fb87..9bd4c3b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtMid.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtMid.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbMidFeatureTable[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtPost.c
index c97f746..b2a40aa 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtPost.c
@@ -56,20 +56,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbPostFeatureTable[];
 extern  OPTION_GNB_CONFIGURATION  GnbPostAfterDramFeatureTable[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtReset.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtReset.c
index 9bf62f5..8331a3b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/GnbInitAtReset.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
index 249768b..4ff31b1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
@@ -64,14 +64,12 @@
 #define FILECODE PROC_GNB_MODULES_GNBCABLESAFE_GNBCABLESAFE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +87,6 @@ UINT8 AuxDataTranslationTable [] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
index 27ed1b8..56ae612 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
@@ -60,20 +60,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_SERVICE  *ServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
index bb15e6e..3cf57b9 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBCPUACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
index bfef414..210400b 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
@@ -56,13 +56,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBHEAP_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
index 1d6be12..d627e41 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
@@ -55,19 +55,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBIOACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
index db2f717..135bf0f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBMEMACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
index a1758d0..03c2910 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBPCIACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbTable.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbTable.c
index 7de0d95..73f77ce 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbCommonLib/GnbTable.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBTABLE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
index 5f267c6..c6d067c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
@@ -58,18 +58,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBFAMTRANSLATION_GNBPCIETRANSLATION_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
index 05fb4ea..5a4a2f3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
@@ -62,7 +62,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,13 +69,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
index 0b41069..87b3f79 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,13 +66,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
index ee3bb97..3e1d094 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
@@ -57,13 +57,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXCARDINFO_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +74,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
index fd7ab4e..a13d7d8 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
@@ -63,14 +63,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXENUMCONNECTORS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -100,7 +98,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
index 7ecb6fa..2a7e34d 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
@@ -64,14 +64,12 @@
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXPOWERPLAYTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 /// Software state
@@ -95,7 +93,6 @@ typedef struct {
 } DPM_STATE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
index bfd0f31..725546e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
@@ -60,21 +60,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GNBGFXINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c
index 90e9ca5..c01f9b8 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBIOMMUIVRS_GNBIOMMUIVRS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 #define IVRS_TABLE_LENGTH 8 * 1024
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c
index ff4d979..d88e03f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c
@@ -61,17 +61,14 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBIVRSLIB_GNBIVRSLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
index e668f1b..3d8a3f9 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV1_GNBNBINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
index 333f46c..843fe0e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
@@ -69,20 +69,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEALIBV1_PCIEALIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern UINT8  AlibSsdt[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
index d69a896..4631ba0 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
@@ -65,7 +65,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,13 +72,11 @@ extern BUILD_OPT_CFG UserOptions;
 extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
index ee7ef01..d6c087a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
index 5398ca1..acb374a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEINPUTPARSER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINTN
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
index 1c103f7..67a01ab 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEMAPTOPOLOGY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
index 19b6055..4296089 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
@@ -58,13 +58,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +73,6 @@ typedef struct {
 } PCIE_ASPM_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
index d31876a..36dcfbb 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
@@ -54,18 +54,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMBLACKLIST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
index 2d4ffe5..1fb5185 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
@@ -56,13 +56,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMEXITLATENCY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +72,6 @@ typedef struct {
 } PCIE_EXIT_LATENCY_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
index 884f076..0f13b9e 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPHYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,7 +66,6 @@
 #define MAX_NUM_LANE_PER_PHY  8
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,13 +79,11 @@ INT8  DeemphasisSel [] = {      1,         0,        1,      1,       0,
 INT8  DeemphGen1Nom [] = {      42,        42,       0,      0,       42,       42};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
index b4ee0db..7b9ff87 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,18 +72,15 @@
 #define PIF_GANG_ALL   (0x1 << 25)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
index 556c7fd..4b52dcf 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTREGACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
index 6f5d34e..f047176 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
index cf9d127..1079ecf 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
@@ -60,19 +60,16 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPOWERMGMT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
index 1d0d0ba..2875dde 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
@@ -58,18 +58,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIESILICONSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
index a9f8b30..2df357c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETIMER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
index 2da536e..15bd87f 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETOPOLOGYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
index fd37187..8535e24 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEUTILITYLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /// Lane type
@@ -79,7 +78,6 @@ typedef enum {
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -88,7 +86,6 @@ typedef struct {
 } PCIE_GLOBAL_GEN_CAP_WORKSPACE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
index 48d59af..8170342 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIETRAINING_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
index 8914631..94e79db 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
@@ -59,14 +59,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIEWORKAROUNDS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -111,7 +109,6 @@ PcieIsDeskewCardDetected (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c
index c6dfcb3..4f91ab1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c
@@ -57,19 +57,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBIOMMULIB_GNBSBIOMMULIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
index 898521a..fa0d770 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBLIB_GNBSBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
index 76c4a0b..51c0f47 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBLIB_GNBSBPCIE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbLclkDpm.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbLclkDpm.c
index 5034ed5..0013497 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbLclkDpm.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbLclkDpm.c
@@ -68,13 +68,11 @@
 
 #define FILECODE PROC_GNB_NB_FAMILY_LN_F12NBLCLKDPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +91,6 @@ UINT32  LclkDpmActivityThresholdTable [] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbPowerGate.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbPowerGate.c
index 7611473..3201866 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbPowerGate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbPowerGate.c
@@ -68,7 +68,6 @@
 
 #define FILECODE PROC_GNB_NB_FAMILY_LN_F12NBPOWERGATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define POWER_GATE_GMC_PSO_CONTROL_VALID_NUM  1
@@ -87,7 +86,6 @@
 #define POWER_GATE_UVD_ISO_TIMER              50
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbServices.c
index 3d81adf..6018d04 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbServices.c
@@ -69,13 +69,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_FAMILY_LN_F12NBSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +81,6 @@ extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 FUSE_TABLE  FuseTable;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmu.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmu.c
index 934c7dc..ec22688 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmu.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmu.c
@@ -58,12 +58,10 @@
 
 #define FILECODE PROC_GNB_NB_FAMILY_LN_F12NBSMU_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbFuseTable.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbFuseTable.c
index bb9ad5e..da523c5 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbFuseTable.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbFuseTable.c
@@ -67,18 +67,15 @@
 
 #define FILECODE PROC_GNB_NB_FEATURE_NBFUSETABLE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbLclkDpm.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbLclkDpm.c
index 541880e..e1be08c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbLclkDpm.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Feature/NbLclkDpm.c
@@ -66,19 +66,16 @@
 
 #define FILECODE PROC_GNB_NB_FEATURE_NBLCLKDPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbConfigData.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbConfigData.c
index c24cac7..2c6c68c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbConfigData.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbConfigData.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBCONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInit.c
index 0e44ebb..57e9f24 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInit.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEarly.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEarly.c
index 4b997c4..ee0c601 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEarly.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEnv.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEnv.c
index 5578469..50dcfb1 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtEnv.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtLatePost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtLatePost.c
index 27135cd..5737c90 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtLatePost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtLatePost.c
@@ -61,19 +61,16 @@
 
 #define FILECODE PROC_GNB_NB_NBINITATLATEPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtPost.c
index aee9193..a139e52 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtPost.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtReset.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtReset.c
index 84f12d7..db44f40 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbInitAtReset.c
@@ -56,19 +56,16 @@
 #define FILECODE PROC_GNB_NB_NBINITATRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbPowerMgmt.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbPowerMgmt.c
index 2afca26..6a85f71 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbPowerMgmt.c
@@ -66,19 +66,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
 */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbSmuLib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbSmuLib.c
index 37c9ff1..841b25c 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbSmuLib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/NbSmuLib.c
@@ -58,7 +58,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBSMULIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,12 +70,10 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlib.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlib.c
index 8009506..5932c74 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlib.c
@@ -63,21 +63,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_LN_F12PCIEALIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexConfig.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexConfig.c
index a1b9d4b..ca8aec2 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexConfig.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexConfig.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_LN_F12PCIECOMPLEXCONFIG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexServices.c
index c7b08a3..b508daa 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieComplexServices.c
@@ -62,18 +62,15 @@
 #include  "GnbPcieInitLibV1.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_LN_F12PCIECOMPLEXSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePhyServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePhyServices.c
index ca7f472..b8493cb 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePhyServices.c
@@ -64,19 +64,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_LN_F12PCIEPHYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePifServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePifServices.c
index f1aff83..6629eb3 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PciePifServices.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_LN_F12PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieWrapperServices.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieWrapperServices.c
index 5823eb6..83f95c6 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieWrapperServices.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieWrapperServices.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_LN_F12PCIEWRAPPERSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Feature/PciePowerGate.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Feature/PciePowerGate.c
index 2adf915..5ce7064 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Feature/PciePowerGate.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Feature/PciePowerGate.c
@@ -62,7 +62,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FEATURE_PCIEPOWERGATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +69,6 @@
 #define FORCE_PCIE_PHY_POWERGATING_DISABLE   (1 << 8)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInit.c
index 1f16b7f..716b742 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInit.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEarlyPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
index 60640c5..0198ed4 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATEARLYPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEnv.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEnv.c
index 146b600..207cd26 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtEnv.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtLatePost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtLatePost.c
index 81939e9..55697b7 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtLatePost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtLatePost.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATLATEPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtPost.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtPost.c
index d8c9cec..7628652 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieInitAtPost.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieLateInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieLateInit.c
index 7094ca6..f1a8747 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieLateInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PcieLateInit.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIELATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortInit.c
index 5ed8bd2..5ded703 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortInit.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEPORTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortLateInit.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortLateInit.c
index 450cde2..950deac 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortLateInit.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/PciePortLateInit.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEPORTLATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/mu.c
index c31d794..a473306 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/mu.c
@@ -62,17 +62,14 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +109,6 @@ AlignPointerTo16Byte (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.c b/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.c
index 233a862..bd1c441 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_RECOVERY_CPU_CPURECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.h b/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.h
index a8ab34d..eeeef48 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/Recovery/CPU/cpuRecovery.h
@@ -46,22 +46,18 @@
 #define _CPU_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/GnbRecovery.c b/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/GnbRecovery.c
index fc8378a..d020ad7 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/GnbRecovery.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/GnbRecovery.c
@@ -55,22 +55,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_RECOVERY_GNB_GNBRECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/NbInitRecovery.c b/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/NbInitRecovery.c
index 3269538..9d0cb91 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/NbInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Recovery/GNB/NbInitRecovery.c
@@ -55,13 +55,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_RECOVERY_GNB_NBINITRECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -71,7 +69,6 @@ typedef struct {
 } NB_REGISTER_RECOVERY_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/GeneralServices.h b/src/vendorcode/amd/agesa/f14/Include/GeneralServices.h
index 8407616..a467008 100644
--- a/src/vendorcode/amd/agesa/f14/Include/GeneralServices.h
+++ b/src/vendorcode/amd/agesa/f14/Include/GeneralServices.h
@@ -49,12 +49,10 @@
 #define _GENERAL_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NUMBER_OF_EVENT_DATA_PARAMS 4
@@ -66,7 +64,6 @@
 #define AMD_DEV_VEN_ID_ADDRESS 0
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ typedef struct {
 } AGESA_EVENT;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/GnbInterfaceStub.h b/src/vendorcode/amd/agesa/f14/Include/GnbInterfaceStub.h
index 454daf9..2fe7ed7 100644
--- a/src/vendorcode/amd/agesa/f14/Include/GnbInterfaceStub.h
+++ b/src/vendorcode/amd/agesa/f14/Include/GnbInterfaceStub.h
@@ -50,19 +50,16 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f14/Include/OptionDmi.h
index c6d19b4..7d5866c 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionDmi.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionDmi.h
@@ -48,18 +48,15 @@
 #define _OPTION_DMI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +81,6 @@ typedef struct  {
 } OPTION_DMI_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionFamily12hEarlySample.h b/src/vendorcode/amd/agesa/f14/Include/OptionFamily12hEarlySample.h
index 1da86be..f6cfba1 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionFamily12hEarlySample.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionFamily12hEarlySample.h
@@ -48,19 +48,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /**
@@ -130,7 +127,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionFamily14hEarlySample.h b/src/vendorcode/amd/agesa/f14/Include/OptionFamily14hEarlySample.h
index b8e79fd..5be430c 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionFamily14hEarlySample.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionFamily14hEarlySample.h
@@ -48,19 +48,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /**
@@ -162,7 +159,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionGfxRecovery.h b/src/vendorcode/amd/agesa/f14/Include/OptionGfxRecovery.h
index 5a83467..a5e9b02 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionGfxRecovery.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionGfxRecovery.h
@@ -48,18 +48,15 @@
 #define _OPTION_GFX_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +73,6 @@ typedef struct  {
 } OPTION_GFX_RECOVERY_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionGnb.h b/src/vendorcode/amd/agesa/f14/Include/OptionGnb.h
index f986944..c931c0b 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionGnb.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionGnb.h
@@ -48,18 +48,15 @@
 #define _OPTION_GNB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +87,6 @@ typedef struct {
 } GNB_BUILD_OPTIONS;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h
index 8866792..381595c 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionMemory.h
@@ -54,19 +54,16 @@
 #include "ma.h"
 #include "mp.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MAX_FF_TYPES      6   ///< Maximum number of DDR Form factors (UDIMMs, RDIMMMs, SODIMMS) supported
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -309,7 +306,6 @@ typedef struct _MEM_PSC_FLOW_BLOCK {
 } MEM_PSC_FLOW_BLOCK;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 /* Feature Default Return */
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMultiSocket.h b/src/vendorcode/amd/agesa/f14/Include/OptionMultiSocket.h
index 2a20d0e..d47ad7d 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionMultiSocket.h
@@ -48,18 +48,15 @@
 #define _OPTION_MULTISOCKET_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -161,7 +158,6 @@ typedef struct  {
 } OPTION_MULTISOCKET_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h
index 5680e7d..b3e506f 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionPstate.h
@@ -50,17 +50,14 @@
 #include "cpuPstateTables.h"
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -111,7 +108,6 @@ typedef struct  {
 } OPTION_PSTATE_LATE_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f14/Include/OptionSlit.h
index 82568bb..51c4961 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionSlit.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionSlit.h
@@ -48,18 +48,15 @@
 #define _OPTION_SLIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -91,7 +88,6 @@ typedef struct  {
 } OPTION_SLIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f14/Include/OptionSrat.h
index f4c02eb..6c3e6da 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionSrat.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionSrat.h
@@ -48,18 +48,15 @@
 #define _OPTION_SRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,7 +74,6 @@ typedef struct  {
 } OPTION_SRAT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f14/Include/OptionWhea.h
index e8fdf7c..ef7d080 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionWhea.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionWhea.h
@@ -48,18 +48,15 @@
 #define _OPTION_WHEA_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,7 +75,6 @@ typedef struct  {
 } OPTION_WHEA_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h
index ae4ede0..7b55f7f 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h
+++ b/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h
@@ -49,18 +49,15 @@
 #define _OPTION_HT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -96,7 +93,6 @@ typedef struct {
 } OPTION_HT_INIT_RESET;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/agesa/f14/Include/PlatformMemoryConfiguration.h
index 2e535ac..209b91c 100644
--- a/src/vendorcode/amd/agesa/f14/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/agesa/f14/Include/PlatformMemoryConfiguration.h
@@ -48,7 +48,6 @@
 #define _PLATFORM_MEMORY_CONFIGURATION_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #ifndef PSO_ENTRY
@@ -56,11 +55,9 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
index 68d9e6f..8ca47c0 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
@@ -59,7 +59,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LEGACY_PROC_DISPATCHER_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE DispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c
index a669d8b..bc1a2fb 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/agesaCallouts.c
@@ -57,17 +57,14 @@
 
 #define FILECODE LEGACY_PROC_AGESACALLOUTS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +75,11 @@ AgesaGetIdsData  (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c
index 32b5fb4..c61acd5 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/hobTransfer.c
@@ -66,18 +66,15 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE LEGACY_PROC_HOBTRANSFER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +84,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Lib/amdlib.c b/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
index 24c162a..f858906 100644
--- a/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f14/Lib/amdlib.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LIB_AMDLIB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ LibAmdGetDataFromPtr (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f14/Lib/amdlib.h b/src/vendorcode/amd/agesa/f14/Lib/amdlib.h
index 17b2be9..3c8333d 100644
--- a/src/vendorcode/amd/agesa/f14/Lib/amdlib.h
+++ b/src/vendorcode/amd/agesa/f14/Lib/amdlib.h
@@ -48,7 +48,6 @@
 #define _AMD_LIB_H_
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define IOCF8 0xCF8
@@ -64,17 +63,14 @@
 #define    DR7_REG  0x17
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c
index 89416c6..8ec99e9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10InitEarlyTable.c
@@ -60,22 +60,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c
index f68d74d..1c1b5ed 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10IoCstate.c
@@ -66,7 +66,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10IOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,13 +76,11 @@ F10InitializeIoCstateOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            IoCstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
index 455c824..6d97289 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10MULTILINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PackageType.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PackageType.h
index 771710d..dac4c14 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PackageType.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PackageType.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -72,13 +70,11 @@
 #define PACKAGE_TYPE_S1G4                   PACKAGE_TYPE_S1G3_S1G4
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
index cece9dc..9911229 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMASYMBOOSTINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -86,7 +83,6 @@ SetAsymBoost (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
index 609cc21..ccf5ecd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
index da77c29..a8c917c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMDUALPLANEONLYSUPPORT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -87,7 +84,6 @@ SetPstateMSR (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
index dcd5d4f..0a470f1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
index d5b515f..5558a90 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
@@ -68,12 +68,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBCOFVIDINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for performing the steps outlined in
@@ -84,7 +82,6 @@ typedef struct {
 } NB_COF_VID_INIT_WARM;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -102,7 +99,6 @@ PmNbCofVidInitWarmCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
index 6418641..2077a73 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
index 50b7238..0fb4a96 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
@@ -65,12 +65,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBPSTATEINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for modifying the P-state
@@ -81,7 +79,6 @@ typedef struct {
 } NB_PSTATE_INIT;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -92,7 +89,6 @@ PmNbPstateInitCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
index fc46161..9bdd5fc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
index 0bc8ffe..39fee18 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10SINGLELINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
index 185f9bf..8edb7fd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
@@ -76,7 +76,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
index 3fd8c61..56c663f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
index 15c2403..289b8a7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
index bfbd19e..45cfad5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
index 762c2ea..124b865 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES ROMDATA *CpuF10BlMicroCodePatchArray[];
@@ -76,7 +73,6 @@ extern CONST UINT8 ROMDATA CpuF10BlNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
index 3daa075..b99c844 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10BlMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
index e4ee443..c250179 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
index 483fec3..b23f848 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
index e08498e..03e830e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
index d8d6180..5b05376 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
index 26d5460..46348f7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DALOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
index 96438f6..65f72a9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
index ecadb86..767e33d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10DaMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
index b7025c2..4cc39f1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
index c6cf1fc..16530bf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
@@ -53,12 +53,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch01000085 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
index b4a689a..f52a565 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
@@ -53,12 +53,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c6 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
index 9f22f25..3f7c82d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
@@ -53,12 +53,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c7 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
index 84b9982..14226e8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
@@ -53,12 +53,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1028,11 +1026,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c8 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
index abd6d3c..688eaba 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
index 09d826b..505a097 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,7 +79,6 @@ F10InitializeHwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
index f3bfd0d..0cd129e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevCMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
index 5b0cf56..b49379a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
index ede06dc..bb1127c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCSWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ F10InitializeSwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
index 8f324a9..46d8e25 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
index d657152..c17935d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
index 9f5c9c8..804f996 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
index 38905bd..04abc47 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
index 2364217..96f03a2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
index 75757e1..94d33e0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RbMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
index bfe0eb1..d172292 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
index 60c8f0d..3ce6c8b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c
@@ -55,12 +55,10 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1030,11 +1028,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c4 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
index 62cc60c..5848f75 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
@@ -55,12 +55,10 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1030,11 +1028,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c5 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
index 8febf1e..6a3cbb9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDMSGBASEDC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ IsDramScrubberEnabled (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
index c53e7d5..5abf849 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
index eb0c8bc..11069fb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF10HyMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
index d657ad5..fb4491f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
index e837ad9..a823e67 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
index 4e1c775..b60149a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
index 8c148ac..6aa6f85 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
@@ -57,12 +57,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,12 +69,10 @@ extern CONST MICROCODE_PATCHES ROMDATA *CpuF10HyMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF10HyNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
index 1dc9e93..72cad86 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10HyMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
index d44dc46..c006db4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
index 8a04c33..fd951da 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
@@ -55,12 +55,10 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1030,11 +1028,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000bf =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
index dce594f..27c4e36 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
index 75d5e27..0616c95 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevEMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
index 9005fe5..ab33c92 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
index abfb1ab..bbad939 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
index ad73fa5..c5453e0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF10PhMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
index c355c9a..f2d6205 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
index 32a574a..844938c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
index 59522a4..b818350 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
@@ -57,12 +57,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,12 +69,10 @@ extern CONST UINT8 ROMDATA CpuF10PhNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
index 16183a3..ddea5b5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
@@ -63,12 +63,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUCOMMONF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /**
@@ -89,12 +87,10 @@ typedef union {
 } NODE_ID_MSR;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
index c14c960..20d294c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c
index c696f4f..e07c653 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandId.c
@@ -59,22 +59,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10BRANDID_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_BRAND_TABLE *F10BrandIdString1Tables[];
@@ -83,7 +79,6 @@ extern CONST UINT8 F10BrandIdString1TableCount;
 extern CONST UINT8 F10BrandIdString2TableCount;
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
index 2486284..555d1ad 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
@@ -55,22 +55,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -188,7 +184,6 @@ CONST CHAR8 ROMDATA str2_SC_0T[] = "0T Processor";
 CONST CHAR8 ROMDATA str2_SC_5T[] = "5T Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
index d8ab245..d4438e2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -92,7 +88,6 @@ CONST CHAR8 ROMDATA str_L_Dual_Core_Processor[] = "L Dual-Core Processor";
 CONST CHAR8 ROMDATA str_H_Dual_Core_Processor[] = "H Dual-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
index fb0249c..e446b01 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -91,7 +87,6 @@ CONST CHAR8 ROMDATA str2_KX_HE_C32[] = "KX HE";
 CONST CHAR8 ROMDATA str2_GL_EE_C32[] = "GL EE";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
index a02dedc..0eeb103 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
@@ -55,22 +55,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +108,6 @@ CONST CHAR8 ROMDATA str2_KS_EE[] = "KS HE";
 CONST CHAR8 ROMDATA str2_QCP[] = " Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
index 833a13b..11c83fa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
@@ -55,22 +55,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +85,6 @@ CONST CHAR8 ROMDATA str2_KS_G34[] = "KS";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
index 8e0145d..4018d14 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
@@ -55,22 +55,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -94,7 +90,6 @@ CONST CHAR8 ROMDATA str_Athlon_II_DC_M3[] = "AMD Athlon(tm) II Dual-Core M3";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
index 990884a..f670e23 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
@@ -56,22 +56,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -92,7 +88,6 @@ CONST CHAR8 ROMDATA str_0_Triple_Core_Processor[] = "0 Triple-Core Processor";
 CONST CHAR8 ROMDATA str_0_Quad_Core_Processor[] = "0 Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
index 4f88c9d..4ad4879 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CACHEDEFAULTS_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define BSP_STACK_SIZE            16384
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
index 5ef5699..2bab20a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
@@ -76,7 +76,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c
index ee54fa8..c0a5490 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Cpb.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
index ad00e44..4611dc7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Dmi.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10DMI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ F10Translate7BitVidTo6Bit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
index cdb52c5..c2496f5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
@@ -65,12 +65,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10EARLYINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Enum for handling code branching while transitioning to the
@@ -83,7 +81,6 @@ typedef enum {
 } GO_TO_STEP;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -100,7 +97,6 @@ WaitForCpuFidAndDidToMatch (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
index f5a1af3..e231249 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
index cca3ccd..fff369c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10FEATURELEVELING_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -89,7 +86,6 @@ updateCpuFeatureList (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
index d17a0e4..b6da9b8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
@@ -50,19 +50,16 @@
 #include "cpuFamilyTranslation.h"
 #include "cpuPostInit.h"
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// F10 CPU Feature Low
@@ -177,7 +174,6 @@ typedef struct {
   CPU_F10_EXT_FEATURES_HI CpuF10ExtFeaturesHi;  ///< High
 } CPU_F10_EXT_FEATURES;
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
index cac7569..f618f3c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10HTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c
index 34dbac0..4a0405e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10MsrTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c
index 13307e7..1632259 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
index f469f1d..a2dc740 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -95,7 +92,6 @@ F10PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
index cb27d11..cc01619 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -71,7 +68,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
index 76e7554..6d4150d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
@@ -68,22 +68,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
index 8d2e772..c2bda35 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -107,12 +106,10 @@ CONST UINT32 ROMDATA AltvidSlamTime[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -141,7 +138,6 @@ F10PmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
index d68b8a6..c1389e4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c
index dbfe2d9..436f441 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Pstate.c
@@ -65,12 +65,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,12 +96,10 @@ F10GetFrequencyXlatRegInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
index 8269c7e..40f3419 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10SOFTWARETHERMAL_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
index 17ce9c0..dcfba81 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c
index 09973fb..c3791f2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.c
@@ -67,7 +67,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Register encodings for F3xD8[VSRampTime/VSSlamTime]
@@ -86,17 +85,14 @@ CONST UINT32 ROMDATA VSSlamTime[8] =
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.h
index acacf2f..a7859bc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10Utilities.h
@@ -49,19 +49,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -72,7 +69,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
index ae051dc..d59ba9b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WHEAINITDATATABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F10HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
index eb00672..a10f772 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WORKAROUNDSTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c
index 2c8b5ad..f198cae 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14C6State.c
@@ -61,23 +61,19 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_F14C6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F14_ES_C6_SUPPORT F14EarlySampleC6Support;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c
index ec3e454..41a672f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14IoCstate.c
@@ -63,17 +63,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_F14IOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ F14InitializeIoCstateOnCore (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
index 7e08f4f..46c1821 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
@@ -52,12 +52,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1635,11 +1633,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch0500000B =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
index b4292a4..2dab7fc 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
@@ -52,12 +52,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1635,11 +1633,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch0500001A =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
index 43d988b..f7a4afe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
@@ -52,12 +52,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1635,11 +1633,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch05000025 =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
index 5db7e75..be5c2fe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
@@ -51,12 +51,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1890,11 +1888,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch05000028 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
index fb8edf2..526671b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
@@ -51,12 +51,10 @@
 #include "cpuEarlyInit.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1635,11 +1633,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF14MicrocodePatch05000101 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
\ No newline at end of file
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14PackageType.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14PackageType.h
index 765afbd..c2972d9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14PackageType.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14PackageType.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 // Below equates are defined to cooperate with LibAmdGetPackageType.
@@ -64,13 +62,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c
index c199bb7..ec58faa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnCpb.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c
index 2673af7..fb181eb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnEquivalenceTable.c
@@ -54,17 +54,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,7 +74,6 @@ GetF14OnMicrocodeEquivalenceTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
index e44f07f..0c3646c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
@@ -63,7 +63,6 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,12 +77,10 @@
 extern F14_ES_CORE_SUPPORT F14EarlySampleCoreSupport;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -109,7 +106,6 @@ F14OnProductionErrataAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c
index fa702f6..01a54a7 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnLogicalIdTables.c
@@ -52,17 +52,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +72,6 @@ GetF14OnLogicalIdAndRev (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c
index 8cad6a4..77bc2b9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnMicrocodePatchTables.c
@@ -54,19 +54,16 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES ROMDATA *CpuF14OnMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF14OnNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,7 +76,6 @@ GetF14OnMicroCodePatchesStruct (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c
index da761d8..69f6ae4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnPciTables.c
@@ -52,22 +52,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_ON_F14ONPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c
index 5de63cc..ac625ec 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.c
@@ -62,13 +62,11 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUCOMMONF14UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F14_ES_CORE_SUPPORT F14EarlySampleCoreSupport;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT16 ROMDATA F14MaxNbFreqAtMinVidFreqTable[] =
@@ -108,7 +106,6 @@ CONST UINT16 ROMDATA F14MaxNbFreqAtMinVidFreqTable[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -130,7 +127,6 @@ RoundedDivision (
   IN       UINT32 Divisor
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h
index 5c66172..49229df 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuCommonF14Utilities.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c
index bc15e92..a160bce 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandId.c
@@ -56,17 +56,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14BRANDID_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +84,6 @@ GetF14BrandIdString2 (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_BRAND_TABLE *F14BrandIdString1Tables[];
@@ -96,7 +92,6 @@ extern CONST UINT8 F14BrandIdString1TableCount;
 extern CONST UINT8 F14BrandIdString2TableCount;
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c
index 4ed896b..1ce4978 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14BrandIdFt1.c
@@ -54,22 +54,18 @@
 #include "F14PackageType.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -96,7 +92,6 @@ CONST CHAR8 ROMDATA str_5_APU[] = "5 APU with Radeon(tm) HD Graphics";
 CONST CHAR8 ROMDATA str_APU[] = " APU with Radeon(tm) HD Graphics";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c
index 467ecfa..75606b9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14CacheDefaults.c
@@ -55,17 +55,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14CACHEDEFAULTS_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,7 +75,6 @@ GetF14CacheInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define BSP_STACK_SIZE            16384
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c
index 263061d..8a2106f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Dmi.c
@@ -61,18 +61,15 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14DMI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -104,7 +101,6 @@ DmiF14GetMemInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c
index ff25e24..65ded02 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.c
@@ -57,22 +57,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14LOWPOWERINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.h
index c78632c..a27e5f8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14LowPowerInit.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c
index 7f7776d..23286e5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14MsrTables.c
@@ -53,22 +53,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F14MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c
index 8ac6d02..4accf67 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PciTables.c
@@ -53,22 +53,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c
index 6bad223..3fe55da 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PerCorePciTables.c
@@ -53,22 +53,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14PERCOREPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c
index f0f519b..956bd77 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.c
@@ -63,17 +63,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -92,7 +89,6 @@ F14PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.h
index f8084fa..6c5b314 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerCheck.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -70,7 +67,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c
index 7a9fc21..6185b16 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerMgmtSystemTables.c
@@ -60,17 +60,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14POWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ GetF14SysPmTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c
index 4adb54f..20af402 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.c
@@ -65,7 +65,6 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14POWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F14_ES_CORE_SUPPORT F14EarlySampleCoreSupport;
@@ -84,12 +83,10 @@ STATIC CONST UINT32 ROMDATA F14VSRampSlamWaitTimes[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -102,7 +99,6 @@ F14PmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.h
index 257f21b..a38b995 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14PowerPlane.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c
index 64b1fc7..c25924d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Pstate.c
@@ -61,17 +61,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14PSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -119,7 +116,6 @@ F14GetPstateRegisterInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c
index dfd56dd..176e2e5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.c
@@ -58,22 +58,18 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14SOFTWARETHERMAL_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.h
index bdbb20b..09244b8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14SoftwareThermal.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c
index e7614a6..5fef702 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.c
@@ -63,18 +63,15 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -118,7 +115,6 @@ F14GetNumberOfCoresForBrandstring (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.h
index 8bf3dc3..c5c2720 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14Utilities.h
@@ -49,24 +49,20 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c
index dd4c69a..857b333 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/cpuF14WheaInitDataTables.c
@@ -53,17 +53,14 @@
 #define FILECODE PROC_CPU_FAMILY_0X14_CPUF14WHEAINITDATATABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +73,6 @@ GetF14WheaInitData (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F14HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h
index 145a0cb..64ab635 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/cpuFamRegisters.h
@@ -58,7 +58,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c
index 91a3d8f..0d8de96 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.c
@@ -68,22 +68,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_PRESERVEMAILBOX_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PreserveMailboxFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.h
index 969ecee..c8bb3d6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/PreserveMailbox.h
@@ -49,7 +49,6 @@
 #define _PRESERVE_MAILBOX_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #define MAX_PRESERVE_REGISTER_ENTRIES 2      ///< There is room on the heap for up to this per node.
@@ -58,12 +57,10 @@
 typedef UINT32 (*MAILBOX_REGISTER_SAVE_ENTRY) [MAX_PRESERVE_REGISTER_ENTRIES];
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c
index 590bf79..47db47a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -89,7 +86,6 @@ EnableC6OnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE C6FamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.h
index 5f406ef..66e787f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuC6State.h
@@ -48,19 +48,16 @@
 #define _CPU_C6_STATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (C6_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index 1f59baa..fea677c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -79,7 +79,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CacheFlushOnHaltFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c
index 21d3e9b..7850510 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -80,7 +80,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CoreLevelingFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c
index d8bbb83..4ab5b3d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.c
@@ -59,22 +59,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpbFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.h
index 0d1055e..fc73f8d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuCpb.h
@@ -48,19 +48,16 @@
 #define _CPU_CPB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPB_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c
index b43165f..fffd4d6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuDmi.c
@@ -64,18 +64,15 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUDMI_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
@@ -115,7 +112,6 @@ ReleaseDmiBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c
index eaeb990..3d65549 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -78,7 +78,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c
index ecb7a98..bf410d0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.c
@@ -56,22 +56,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 extern CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[];
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h
index f2a28a5..59f63df 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuFeatures.h
@@ -143,17 +143,14 @@
 
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 #define CPU_FEAT_BEFORE_PM_INIT           (0x0000000000000001ull)
@@ -241,7 +238,6 @@ typedef struct {
 } CPU_FEATURE_TABLE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.h
index 19c5838..0efbec2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHtAssist.h
@@ -49,21 +49,18 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HT_ASSIST_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_DISABLE_CACHE (0x00000000 | PROC_CPU_FEATURE_CPUHTASSIST_FILECODE)
 #define AP_LATE_TASK_ENABLE_CACHE  (0x00010000 | PROC_CPU_FEATURE_CPUHTASSIST_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 #define L3_SCRUBBER_CONTEXT_ARRAY_SIZE 4
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c
index f203c86..0f56d60 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.c
@@ -65,22 +65,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUHWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE HwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.h
index 808d2dc..ee1e6b5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuHwC1e.h
@@ -48,19 +48,16 @@
 #define _CPU_HW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c
index 993dfb2..5e963d1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -85,7 +82,6 @@ EnableIoCstateOnSocket (
   IN       AMD_CPU_EARLY_PARAMS *CpuEarlyParams
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE    IoCstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.h
index 684c361..5c683c2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuIoCstate.h
@@ -47,14 +47,12 @@
 #define _CPU_IO_CSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Defines for ACPI C-State Objects
@@ -77,7 +75,6 @@ AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 #define   CSD_COORD_TYPE_HW_ALL 0xFE
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /* AML code definition */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c
index 64becdf..2e8a3c9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPULOWPWRPSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ EnableLowPwrPstateOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE LowPwrPstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.h
index 3ce3cdf..eb84714 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuLowPwrPstate.h
@@ -48,19 +48,16 @@
 #define _CPU_LOW_PWR_PSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (LOW_PWR_PSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c
index d623368..ef1cf63 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUMSGBASEDC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -86,7 +83,6 @@ EnableMsgC1eOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE MsgBasedC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.h
index 3148d20..14646a2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuMsgBasedC1e.h
@@ -48,19 +48,16 @@
 #define _CPU_MSG_BASED_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MSG_BASED_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h
index 81af491..e9f143a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuPstateTables.h
@@ -48,19 +48,16 @@
 #define _CPU_PSTATE_TABLES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSTATE_CPU_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// P-state structure for each state
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c
index a89b0f9..3d23e8a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSlit.c
@@ -69,7 +69,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSLIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,12 +88,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuSlitHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -130,12 +127,10 @@ ReleaseSlitBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c
index 0b3b3f2..cb9bb0d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSrat.c
@@ -62,7 +62,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config record
@@ -70,7 +69,6 @@ extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config
 #define NodeID 0x60
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -95,7 +93,6 @@ STATIC CPU_SRAT_HEADER  ROMDATA CpuSratHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -139,7 +136,6 @@ STATIC
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c
index 903ad0e..881043b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.c
@@ -66,22 +66,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE SwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.h
index 03fcac2..70273eb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuSwC1e.h
@@ -48,19 +48,16 @@
 #define _CPU_SW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (SW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c
index 2c6e18c..6aa3212 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Feature/cpuWhea.c
@@ -62,19 +62,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUWHEA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 extern OPTION_WHEA_CONFIGURATION OptionWheaConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -100,7 +97,6 @@ GetAcpiWheaMain (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
index a1393be..1492182 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
@@ -64,19 +64,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_S3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -152,7 +149,6 @@ RestoreConditionalMsrDevice (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.h
index b854345..e0eecbf 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -317,7 +314,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c
index 711d3f8..dfad926 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/Table.c
@@ -69,17 +69,14 @@ RDATA_GROUP (G1_PEICC)
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -91,7 +88,6 @@ SetRegistersFromTablesAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c
index 938300a..9fcfd7f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cahalt.c
@@ -57,19 +57,16 @@
 #include "Filecode.h"
 
  /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 // typedef unsigned int   uintptr_t;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -101,7 +98,6 @@ ExecuteWbinvdInstruction (
   );
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c
index ebcb58e..8458c20 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUAPICUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /* ApFlags bits */
@@ -89,7 +88,6 @@ RDATA_GROUP (G1_PEICC)
 #define XFER_ELEMENT_SIZE    sizeof (UINT32)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -116,7 +114,6 @@ typedef struct {
 //} IDT_BASE_LIMIT;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -211,7 +208,6 @@ LocalApicInitializationAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h
index acc47a5..9c1dcff 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuApicUtilities.h
@@ -49,13 +49,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define APIC_CTRL_DWORD 0xF
@@ -106,7 +104,6 @@
 #define SIZE_IN_DWORDS(sInput) ((UINT32) (((sizeof (sInput)) + 3) >> 2))
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID (*PF_AP_TASK) (AMD_CONFIG_PARAMS *StdHeader);
@@ -163,7 +160,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 //                   These are   P U B L I C   functions, used by AGESA
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c
index 8df1605..248202f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBist.c
@@ -61,7 +61,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBIST_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -72,7 +71,6 @@ GetBistResults (
   );
 
  /*----------------------------------------------------------------------------------------
-  *                          E X P O R T E D    F U N C T I O N S
   *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c
index 932785b..1d05c00 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuBrandId.c
@@ -62,12 +62,10 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBRANDID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA strEngSample[] = "AMD Engineering Sample";
@@ -81,7 +79,6 @@ CONST AMD_CPU_BRAND ROMDATA Dflt_Str2 = {0, 0, 0, SOCKET_IGNORE, DR_NO_STRING, D
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +90,6 @@ SetBrandIdRegistersAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c
index b680548..152d9a8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.c
@@ -68,17 +68,14 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -101,7 +98,6 @@ McaInitializationAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h
index ba923c5..4ff2e60 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEarlyInit.h
@@ -49,13 +49,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -89,7 +87,6 @@ AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 #define MICROCODE_PATCH_2K_SIZE    2048
 #define MICROCODE_PATCH_4K_SIZE    4096
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -219,7 +216,6 @@ struct _CPU_CORE_LEVELING_FAMILY_SERVICES {             // See Forward Declarati
 
 #define PERFORM_EARLY_ANY_CONDITION 0xFFFFFFFF // the related function always needs to be run
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h
index f8be8a3..6baae23 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEnvInit.h
@@ -48,22 +48,18 @@
 #define _CPU_ENV_INIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 // HobTransfer
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c
index e0ad3c6..dba8f6a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuEventLog.c
@@ -60,13 +60,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUEVENTLOG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define TOTAL_EVENT_LOG_BUFFERS  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +88,6 @@ typedef struct {
 } AGESA_STRUCT_BUFFER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c
index 3809b77..1c05941 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.c
@@ -61,12 +61,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUFAMILYTRANSLATION_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +110,6 @@ CONST CPU_SPECIFIC_SERVICES ROMDATA cpuNullServices =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -125,7 +122,6 @@ GetCpuServices (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpuSupportedFamiliesTable;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h
index c74996a..1fd2127 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuFamilyTranslation.h
@@ -131,7 +131,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 #include "cpuPostInit.h"
@@ -145,12 +144,10 @@
 AGESA_FORWARD_DECLARATION (CPU_SPECIFIC_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -846,7 +843,6 @@ typedef struct {
 } CPU_FAMILY_ID_XLAT_TABLE;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c
index e726784..d844119 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuGeneralServices.c
@@ -66,24 +66,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUGENERALSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTIONS_CONFIG_TOPOLOGY TopologyConfiguration;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 
@@ -187,7 +183,6 @@ AmdIdentifyCore (
 }
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - AGESA common General Services
  *----------------------------------------------------------------------------------------
  */
 
@@ -318,7 +313,6 @@ IdentifyCore (
 
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - cpu component General Services
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c
index 0ca61ec..95521db 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuInitEarlyTable.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ GetCommonEarlyInitOnCoreTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c
index 3dacbf3..d5efdd8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_CPULATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -79,7 +76,6 @@ DisableCf8ExtCfg (
   IN       AMD_CONFIG_PARAMS   *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h
index 6369bfc..e0fd5df 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuLateInit.h
@@ -49,12 +49,10 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -314,7 +312,6 @@
 #define     PSTATE_FLAG_2           0xAA
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -753,7 +750,6 @@ typedef struct _CPU_SRAT_MEMORY_ENTRY {
 } CPU_SRAT_MEMORY_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
index bf888b9..06dbe2b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
@@ -62,13 +62,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUMICROCODEPATCH_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -77,7 +75,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -117,7 +114,6 @@ LoadMicrocodePatchAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c
index 03fdb2c..bc80203 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.c
@@ -67,17 +67,14 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUPOSTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -99,7 +96,6 @@ SyncAllApMtrrToBsc (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h
index f423b8c..854375d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPostInit.h
@@ -49,20 +49,17 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPU_CFOH_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define P_STATE_DATA_GATHER_TEMP_ADDR     0x200000 ///< Fixed the row data at 2M memory address.
 #define GLOBAL_CPU_FEATURE_LIST_TEMP_ADDR 0x200000 ///< Fixed the row data at 2M memory address.
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -186,7 +183,6 @@ struct _CPU_CFOH_FAMILY_SERVICES {                     // See forward reference
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c
index 804829e..42957e2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmt.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -100,7 +97,6 @@ GoToMemInitPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c
index 1bda7bf..167f20e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTMULTISOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -92,7 +89,6 @@ GetEarlyPmErrorsMulti (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.h
index d83b7b5..9762dab 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtMultiSocket.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c
index 21c4c25..1e4a17c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTSINGLESOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ GetEarlyPmErrorsSingle (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.h
index cbd34a1..5bd1001 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSingleSocket.h
@@ -49,25 +49,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h
index a533171..e689928 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuPowerMgmtSystemTables.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define PM_EXEFLAGS_WARM_ONLY    0x00000001   /* Skip step if set && cold reset */
@@ -63,7 +61,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID F_PM_STEP_FUNCTION (
@@ -85,7 +82,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h
index 7d43c17..fa1a466 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuRegisters.h
@@ -59,7 +59,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
@@ -356,7 +355,6 @@ typedef struct {
 /*
  * --------------------------------------------------------------------------------------
  *
- *             D E F I N E S    /   T Y P E D E F S   /  S T R U C T U R E S
  *
  * --------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h
index 9ca54da..bf23375 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuServices.h
@@ -48,12 +48,10 @@
 #define _CPU_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
  /// WARM RESET STATE_BITS
@@ -63,7 +61,6 @@
 #define WR_STATE_POST  03
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -136,7 +133,6 @@ typedef struct _WARM_RESET_REQUEST {
   UINT8             Reserved:(8-5);                     ///< Reserved
 } WARM_RESET_REQUEST;
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c
index fbb7cbb..ae9e448 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/cpuWarmReset.c
@@ -60,22 +60,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUWARMRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -145,7 +141,6 @@ GetWarmResetFlag (
   }
 }
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c
index 800f10b..d4d3dec 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.c
@@ -64,19 +64,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_HEAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
@@ -105,7 +102,6 @@ InsertFreeSpaceNode (
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h b/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h
index 6531496..d00265c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h
@@ -48,13 +48,11 @@
 #define _HEAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define AMD_MTRR_VARIABLE_BASE0 0x200
@@ -108,7 +106,6 @@
 #define AMD_MTRR_FIX4K_UC_DRAM   0x1818181818181818
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Allocate Heap Parameters
@@ -191,7 +188,6 @@ typedef enum _AGESA_BUFFER_HANDLE {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c
index 5709a49..6f183be 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEarly.c
@@ -67,13 +67,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitExeCacheMap[] =
@@ -84,7 +82,6 @@ EXECUTION_CACHE_REGION InitExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -107,7 +104,6 @@ AmdInitEarlyInitializer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c
index 8a540cd..0495ad4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitEnv.c
@@ -63,25 +63,21 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c
index 93b5317..1a19c7b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitLate.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDINITLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
@@ -73,13 +72,11 @@ extern OPTION_SLIT_CONFIGURATION   OptionSlitConfiguration; // global user confi
 extern OPTION_PSTATE_LATE_CONFIGURATION OptionPstateLateConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -102,7 +99,6 @@ AmdInitLateDestructor (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c
index 2af106c..45409f8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitMid.c
@@ -61,25 +61,21 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c
index ea4802d..076dca9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitPost.c
@@ -68,19 +68,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -91,7 +88,6 @@ AmdPostPlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c
index fccb5d9..c6c9fc5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitRecovery.c
@@ -65,12 +65,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_COMMON_AMDINITRECOVERY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c
index 7b75aad..deaa0e1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c
@@ -64,19 +64,16 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_COMMON_AMDINITRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST OPTION_HT_INIT_RESET HtOptionInitReset;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +90,6 @@ AmdInitResetConstructor (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c
index bb78617..563955b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitResume.c
@@ -68,25 +68,21 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITRESUME_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdLateRunApTask.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdLateRunApTask.c
index 9a1c99e..c14aee8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdLateRunApTask.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdLateRunApTask.c
@@ -59,25 +59,21 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDLATERUNAPTASK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE ApDispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c
index ec1f7e7..8aa2006 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3LateRestore.c
@@ -63,19 +63,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDS3LATERESTORE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -85,7 +82,6 @@ AmdS3LateRestorePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c
index eeab385..52c0e9b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdS3Save.c
@@ -66,13 +66,11 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDS3SAVE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT32 ROMDATA S3LateHeapTable[] =
@@ -90,7 +88,6 @@ CONST UINT32 ROMDATA S3LateHeapTable[] =
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -100,7 +97,6 @@ AmdS3SavePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c
index 286647c..b3254f1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/CommonInits.c
@@ -59,24 +59,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_COMMONINITS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c
index d7041d2..03f2bd5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/CreateStruct.c
@@ -61,24 +61,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_CREATESTRUCT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST FUNCTION_PARAMS_INFO FuncParamsInfo[];
 extern CONST UINTN InitializerCount;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c
index e8350a3..8625781 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/S3RestoreState.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_S3RESTORESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 extern S3_SCRIPT_CONFIGURATION    OptionS3ScriptConfiguration;
 extern S3_DISPATCH_FUNCTION_ENTRY S3DispatchFunctionTable[];
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c
index b7aaf22..6c3fa62 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Common/S3SaveState.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_S3SAVESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c
index 462af30..9127f94 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Common/GnbLibFeatures.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define  FILECODE PROC_GNB_COMMON_GNBLIBFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c
index a974108..f284639 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/Family/0x14/F14GfxServices.c
@@ -72,7 +72,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_FAMILY_0X14_F14GFXSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -80,13 +79,11 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c
index 2cb36a6..ceaf098 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxConfigData.c
@@ -61,7 +61,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXCONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -69,13 +68,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c
index 7929d02..9275d45 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxGmcInit.c
@@ -65,7 +65,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXGMCINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,14 +78,12 @@ typedef struct {
 } DCT_CHANNEL_INFO;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -173,7 +170,6 @@ GfxGmcInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c
index 4c6c901..17dc9e0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtEnvPost.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATENVPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c
index a41042d..b8ab73d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtMidPost.c
@@ -63,19 +63,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATMIDPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c
index e8a51de..8e61f80 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxInitAtPost.c
@@ -63,19 +63,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
index c287196..fe54944 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxIntegratedInfoTableInit.c
@@ -71,14 +71,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXINTEGRATEDINFOTABLEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -126,7 +124,6 @@ ULONG ulCSR_M3_ARB_CNTL_FS3D[] = {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c
index 181ecae..2ad9965 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxLib.c
@@ -61,20 +61,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c
index fca5257..0c06bbb 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxRegisterAcc.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXREGISTERACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c
index 1c7a860..436b19b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Gfx/GfxStrapsInit.c
@@ -64,20 +64,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GFX_GFXSTRAPSINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c
index 8eea87e..0462c95 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEarly.c
@@ -59,19 +59,16 @@
 #define FILECODE PROC_GNB_GNBINITATEARLY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEarlyFeatureTable[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c
index a4e65d5..abbe63a 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtEnv.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEnvFeatureTable[];
 extern  BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c
index ac91bfa..3dd1497 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtLate.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern  OPTION_GNB_CONFIGURATION  GnbLateFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c
index 4d2a338..93ae1ed 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtMid.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbMidFeatureTable[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c
index 417977c..bb9a162 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtPost.c
@@ -57,20 +57,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbPostFeatureTable[];
 extern  OPTION_GNB_CONFIGURATION  GnbPostAfterDramFeatureTable[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c
index ef06a2c..f3d278d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/GnbInitAtReset.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
index 809b753..7838233 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCableSafe/GnbCableSafe.c
@@ -61,12 +61,10 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCABLESAFE_GNBCABLESAFE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +82,6 @@ UINT8 AuxDataTranslationTable [] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
index 5facb18..f0e3727 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
index 1583eb3..0b5a642 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBCPUACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
index e6e7c03..65c67b6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
@@ -56,13 +56,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBHEAP_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
index 7440ba2..b56af42 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
@@ -56,19 +56,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBIOACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
index 64679b4..1b6b3f0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBMEMACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
index b657e54..e9d1efe 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBPCIACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
index 123971f..3621966 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
@@ -62,7 +62,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,13 +69,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
index d487147..00a6502 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -68,13 +67,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
index e56e905..d6f5805 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
@@ -58,13 +58,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXCARDINFO_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,7 +75,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
index 70aa595..8b2ad95 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
@@ -64,14 +64,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXENUMCONNECTORS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -101,7 +99,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
index 5f06eb6..b1dad22 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
@@ -65,14 +65,12 @@
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXPOWERPLAYTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 /// Software state
@@ -95,7 +93,6 @@ typedef struct {
 } DPM_STATE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
index 0b33ecf..506228e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV1_GNBNBINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
index b276382..83b8cb9 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
@@ -69,7 +69,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEALIBV1_PCIEALIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +77,11 @@ extern AGESA_STATUS PcieFmAlibBuildAcpiTable (VOID *AlibSsdtPtr, AMD_CONFIG_PARA
 ;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
index cf5400f..fc381b3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
@@ -64,7 +64,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,13 +74,11 @@ extern BUILD_OPT_CFG UserOptions;
 extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
index 788c0b7..81a7fa5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
index 53d0705..1cc6868 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEINPUTPARSER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINTN
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
index 77ae9c3..f987271 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEMAPTOPOLOGY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
index 48306bd..149dd6e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspm.c
@@ -59,13 +59,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +74,6 @@ typedef struct {
 } PCIE_ASPM_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
index 0c22d25..bdba144 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
@@ -55,18 +55,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMBLACKLIST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
index f5693f4..a8ff698 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
@@ -57,13 +57,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMEXITLATENCY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +73,6 @@ typedef struct {
 } PCIE_EXIT_LATENCY_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
index b2001ef..c02f4a4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPHYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,19 +66,16 @@
 #define MAX_NUM_LANE_PER_PHY  8
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
index b1b7c17..9e9dca4 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,19 +72,16 @@
 #define PIF_GANG_ALL   (0x1 << 25)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
index c606583..236ba93 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTREGACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
index ac23548..7017a34 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
index 5cf003f..3c995c1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
@@ -60,19 +60,16 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPOWERMGMT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c
index b24b37b..d7c5489 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSbLink.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIESBLINK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
index 546fcbb..0860b60 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
@@ -59,18 +59,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIESILICONSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
index ad6b39b..19e453b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETIMER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
index 68a2dcd..4f3c52f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETOPOLOGYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
index 3911dbf..131d336 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
@@ -60,13 +60,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEUTILITYLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -75,7 +73,6 @@ typedef struct {
 } PCIE_GLOBAL_GEN_CAP_WORKSPACE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
index d546f90..b4352b8 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
@@ -63,19 +63,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIETRAINING_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
index f80f445..94b73e3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
@@ -60,14 +60,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIEWORKAROUNDS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -112,7 +110,6 @@ PcieIsDeskewCardDetected (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c
index 827bd7f..2abc91f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkDpm.c
@@ -69,13 +69,11 @@
 
 #define FILECODE PROC_GNB_NB_FAMILY_0X14_F14NBLCLKDPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -94,7 +92,6 @@ UINT32  LclkDpmActivityThresholdTable [] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c
index 407ab44..e157bad 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbLclkNclkRatio.c
@@ -63,7 +63,6 @@
 
 #define FILECODE PROC_GNB_NB_FAMILY_0X14_F14NBLCLKNCLKRATIO_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c
index 99732d5..e560308 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbPowerGate.c
@@ -67,7 +67,6 @@
 #define FILECODE PROC_GNB_NB_FAMILY_0x14_F14NBPOWERGATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define POWER_GATE_GMC_PSO_CONTROL_VALID_NUM  1
@@ -90,7 +89,6 @@
 #define POWER_GATE_UVD_RESET_TIMER            50
 #define POWER_GATE_UVD_ISO_TIMER              50
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c
index d067875..e3be806 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbServices.c
@@ -69,13 +69,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_FAMILY_0X14_F14NBSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +81,6 @@ extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 FUSE_TABLE  FuseTable;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c
index 8a704c9..fea7ca3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmu.c
@@ -58,12 +58,10 @@
 
 #define FILECODE PROC_GNB_NB_FAMILY_0X14_F14NBSMU_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c
index 0ae5507..b8dc155 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbFuseTable.c
@@ -66,17 +66,14 @@
 
 #define FILECODE PROC_GNB_NB_FEATURE_NBFUSETABLE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c
index da43f63..a656cac 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Feature/NbLclkDpm.c
@@ -67,19 +67,16 @@
 
 #define FILECODE PROC_GNB_NB_FEATURE_NBLCLKDPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c
index 5c20591..a8f1cf0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbConfigData.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBCONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c
index 458bd80..9de0c56 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInit.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c
index d4c90c7..b611d07 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEarly.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c
index 08bf54f..54da3d5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtEnv.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c
index 1854226..4fc8ed1 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtLatePost.c
@@ -62,19 +62,16 @@
 
 #define FILECODE PROC_GNB_NB_NBINITATLATEPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c
index 57280a1..29cb3fa 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtPost.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c
index e410a16..446c494 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbInitAtReset.c
@@ -57,19 +57,16 @@
 #define FILECODE PROC_GNB_NB_NBINITATRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c
index 0a9ccc1..b7dff93 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbPowerMgmt.c
@@ -64,19 +64,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
 */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c
index 76401d4..780d471 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/NbSmuLib.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_NB_NBSMULIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,12 +72,10 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c
index 066bcf8..9a6afda 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlib.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEALIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c
index 88937c6..b120d5c 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexConfig.c
@@ -60,19 +60,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIECOMPLEXCONFIG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c
index 3f2a5bc..0983a8d 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieComplexServices.c
@@ -63,18 +63,15 @@
 #include  GNB_MODULE_DEFINITIONS (GnbPcieInitLibV1)
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIECOMPLEXSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c
index c8b6333..8c44679 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePhyServices.c
@@ -57,19 +57,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEPHYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c
index 2bdf7e1..9ff56ac 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PciePifServices.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
index aec4686..3169a66 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieWrapperServices.c
@@ -63,19 +63,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X14_F14PCIEWRAPPERSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c
index f8a0435..89ac18f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Feature/PciePowerGate.c
@@ -63,7 +63,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_FEATURE_PCIEPOWERGATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,7 +70,6 @@
 #define FORCE_PCIE_PHY_POWERGATING_DISABLE   (1 << 1)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c
index b83afea..4e32723 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInit.c
@@ -64,19 +64,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
index 9b5ae2f..df207af 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEarlyPost.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATEARLYPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c
index f36e73a..c09e74b 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtEnv.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c
index 19504a2..58b7850 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtLatePost.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATLATEPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c
index 1463796..e7f858f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieInitAtPost.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c
index bcd48c7..9944c19 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieLateInit.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIELATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c
index f218741..cd31d66 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PcieMiscLib.c
@@ -61,13 +61,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEMISCLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -76,7 +74,6 @@ typedef struct {
 } PCIE_GLOBAL_GEN_CAP_WORKSPACE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c
index 3969286..4ddc0d0 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortInit.c
@@ -63,19 +63,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEPORTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c
index 832f1c8..befc8f5 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/PciePortLateInit.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_PCIE_PCIEPORTLATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c
index 0873da1..b75b5c3 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/mu.c
@@ -63,17 +63,14 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -115,7 +112,6 @@ AlignPointerTo16Byte (
 */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c
index a5e27e5..523c8e6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.c
@@ -60,22 +60,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_RECOVERY_CPU_CPURECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.h b/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.h
index b99d2b7..c226acd 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/CPU/cpuRecovery.h
@@ -48,22 +48,18 @@
 #define _CPU_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.c
index 0352e33..86d1d6e 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.c
@@ -55,22 +55,18 @@
 #include "Filecode.h"
 #define FILECODE PROC_RECOVERY_GNB_GFXRECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_GFX_RECOVERY_CONFIGURATION OptionGfxRecoveryConfiguration;  // global user config record
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.h b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.h
index 2e6f40c..7091344 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.h
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GfxRecovery.h
@@ -48,22 +48,18 @@
 #define _GFX_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c
index 9118a37..8339fb6 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/GnbRecovery.c
@@ -57,22 +57,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_RECOVERY_GNB_GNBRECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c
index 8ffafd9..ffbd01f 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Recovery/GNB/NbInitRecovery.c
@@ -56,13 +56,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_RECOVERY_GNB_NBINITRECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -72,7 +70,6 @@ typedef struct {
 } NB_REGISTER_RECOVERY_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/GeneralServices.h b/src/vendorcode/amd/agesa/f15/Include/GeneralServices.h
index 5fa4a89..cb7e7f2 100644
--- a/src/vendorcode/amd/agesa/f15/Include/GeneralServices.h
+++ b/src/vendorcode/amd/agesa/f15/Include/GeneralServices.h
@@ -47,12 +47,10 @@
 #define _GENERAL_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NUMBER_OF_EVENT_DATA_PARAMS 4
@@ -64,7 +62,6 @@
 #define AMD_DEV_VEN_ID_ADDRESS 0
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct {
 } AGESA_EVENT;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/GnbInterfaceStub.h b/src/vendorcode/amd/agesa/f15/Include/GnbInterfaceStub.h
index e4f89d8..f6f1285 100644
--- a/src/vendorcode/amd/agesa/f15/Include/GnbInterfaceStub.h
+++ b/src/vendorcode/amd/agesa/f15/Include/GnbInterfaceStub.h
@@ -50,19 +50,16 @@
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f15/Include/OptionDmi.h
index 6dba872..ab5e442 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionDmi.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionDmi.h
@@ -45,18 +45,15 @@
 #define _OPTION_DMI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct  {
 } OPTION_DMI_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionFamily15hEarlySample.h b/src/vendorcode/amd/agesa/f15/Include/OptionFamily15hEarlySample.h
index 9d77332..fd11c2b 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionFamily15hEarlySample.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionFamily15hEarlySample.h
@@ -46,19 +46,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -223,7 +220,6 @@ typedef struct {
 } F15_TN_ES_MCU_PATCH;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionGfxRecovery.h b/src/vendorcode/amd/agesa/f15/Include/OptionGfxRecovery.h
index a1f4d03..90db050 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionGfxRecovery.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionGfxRecovery.h
@@ -45,18 +45,15 @@
 #define _OPTION_GFX_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,7 +70,6 @@ typedef struct  {
 } OPTION_GFX_RECOVERY_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionGnb.h b/src/vendorcode/amd/agesa/f15/Include/OptionGnb.h
index 4b58645..9d7cffa 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionGnb.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionGnb.h
@@ -46,18 +46,15 @@
 #define _OPTION_GNB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -102,7 +99,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f15/Include/OptionMemory.h
index 2635dbc..3c3a480 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionMemory.h
@@ -52,19 +52,16 @@
 #include "ma.h"
 #include "mp.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MAX_FF_TYPES      6   ///< Maximum number of DDR Form factors (UDIMMs, RDIMMMs, SODIMMS) supported
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -314,7 +311,6 @@ typedef struct _MEM_PSC_FLOW_BLOCK {
 } MEM_PSC_FLOW_BLOCK;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 /* Feature Default Return */
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMultiSocket.h b/src/vendorcode/amd/agesa/f15/Include/OptionMultiSocket.h
index 493e46e..aa4980a 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionMultiSocket.h
@@ -46,18 +46,15 @@
 #define _OPTION_MULTISOCKET_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -206,7 +203,6 @@ typedef struct  {
 } OPTION_MULTISOCKET_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f15/Include/OptionPstate.h
index 1ffaf94..efd75cf 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionPstate.h
@@ -47,17 +47,14 @@
 #include "cpuPstateTables.h"
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -108,7 +105,6 @@ typedef struct  {
 } OPTION_PSTATE_LATE_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f15/Include/OptionSlit.h
index 1dfc957..8755308 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionSlit.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionSlit.h
@@ -45,18 +45,15 @@
 #define _OPTION_SLIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +85,6 @@ typedef struct  {
 } OPTION_SLIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f15/Include/OptionSrat.h
index 890ea34..1e50016 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionSrat.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionSrat.h
@@ -45,18 +45,15 @@
 #define _OPTION_SRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +71,6 @@ typedef struct  {
 } OPTION_SRAT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f15/Include/OptionWhea.h
index fcaa23e..86cd41c 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionWhea.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionWhea.h
@@ -45,18 +45,15 @@
 #define _OPTION_WHEA_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +72,6 @@ typedef struct  {
 } OPTION_WHEA_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f15/Include/OptionsHt.h
index ddcc024..dc7be62 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionsHt.h
+++ b/src/vendorcode/amd/agesa/f15/Include/OptionsHt.h
@@ -47,18 +47,15 @@
 #define _OPTION_HT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -103,7 +100,6 @@ typedef struct {
 } OPTION_HT_INIT_RESET;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/agesa/f15/Include/PlatformMemoryConfiguration.h
index 402b1cf..861c753 100644
--- a/src/vendorcode/amd/agesa/f15/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/agesa/f15/Include/PlatformMemoryConfiguration.h
@@ -46,7 +46,6 @@
 #define _PLATFORM_MEMORY_CONFIGURATION_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #ifndef PSO_ENTRY
@@ -54,11 +53,9 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c
index ae25a49..ef43ff5 100644
--- a/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c
@@ -57,7 +57,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE LEGACY_PROC_DISPATCHER_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE DispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f15/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f15/Legacy/Proc/agesaCallouts.c
index 1af03b9..6c95861 100644
--- a/src/vendorcode/amd/agesa/f15/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f15/Legacy/Proc/agesaCallouts.c
@@ -60,28 +60,23 @@
 
 #define FILECODE LEGACY_PROC_AGESACALLOUTS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f15/Legacy/Proc/hobTransfer.c
index b2accb2..e9ca22a 100644
--- a/src/vendorcode/amd/agesa/f15/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f15/Legacy/Proc/hobTransfer.c
@@ -64,18 +64,15 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE LEGACY_PROC_HOBTRANSFER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -85,7 +82,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Lib/amdlib.c b/src/vendorcode/amd/agesa/f15/Lib/amdlib.c
index 90b0272..cb9e062 100644
--- a/src/vendorcode/amd/agesa/f15/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f15/Lib/amdlib.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE LIB_AMDLIB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -96,7 +93,6 @@ LibAmdGetDataFromPtr (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10InitEarlyTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10InitEarlyTable.c
index c545373..4128769 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10InitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10InitEarlyTable.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -82,7 +79,6 @@ GetF10EarlyInitOnCoreTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10IoCstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10IoCstate.c
index 904e60b..29eddf1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10IoCstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10IoCstate.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10IOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -83,13 +82,11 @@ F10IsIoCstateFeatureSupported (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            IoCstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
index 61914a6..d607f98 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10MultiLinkPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10MULTILINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PackageType.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PackageType.h
index b8a3fe2..6759f34 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PackageType.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PackageType.h
@@ -46,13 +46,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -71,13 +69,11 @@
 #define PACKAGE_TYPE_S1G4                   PACKAGE_TYPE_S1G3_S1G4
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
index 8c31a4d..d9fd330 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMASYMBOOSTINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -86,7 +83,6 @@ SetAsymBoost (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
index d03d676..28b720f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmAsymBoostInit.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
index 0fc1631..672d3bb 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMDUALPLANEONLYSUPPORT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -87,7 +84,6 @@ SetPstateMSR (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
index 53ba399..b31a15e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmDualPlaneOnlySupport.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
index 515484c..009d6a0 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.c
@@ -66,12 +66,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBCOFVIDINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for performing the steps outlined in
@@ -82,7 +80,6 @@ typedef struct {
 } NB_COF_VID_INIT_WARM;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -100,7 +97,6 @@ PmNbCofVidInitWarmCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
index 94aad6d..d9190e6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbCofVidInit.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
index bf3f4bd..3642444 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.c
@@ -64,12 +64,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10PMNBPSTATEINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Structure used for modifying the P-state
@@ -80,7 +78,6 @@ typedef struct {
 } NB_PSTATE_INIT;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -91,7 +88,6 @@ PmNbPstateInitCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
index 1701ee4..80076a1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10PmNbPstateInit.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
index 7a3a3ec..f6b1611 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/F10SingleLinkPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_F10SINGLELINKPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
index ad3b28f..5d64ed4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlCacheFlushOnHalt.c
@@ -76,7 +76,6 @@ extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
index cbbb43f..6113956 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlEquivalenceTable.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
index 3f1b5dd..cb98df6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
index ed0ad17..c1410ab 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlLogicalIdTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
index 4cf0507..19b390e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMicrocodePatchTables.c
@@ -57,17 +57,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES ROMDATA *CpuF10BlMicroCodePatchArray[];
@@ -75,7 +72,6 @@ extern CONST UINT8 ROMDATA CpuF10BlNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
index b56d290..a37de8f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlMsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10BlMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
index e6c15cb..e28071a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/BL/F10BlPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_BL_F10BLPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
index 4ca87cb..f373d12 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaCacheFlushOnHalt.c
@@ -77,7 +77,6 @@ extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
index 4405135..190d371 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaEquivalenceTable.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
index ca135db..f42ca4c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
index b828ff4..327b650 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaLogicalIdTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DALOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
index 2e77327..e66ae10 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMicrocodePatchTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
index 261f432a..8aa40b6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaMsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10DaMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
index 45e9194..827e561 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/DA/F10DaPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_DA_F10DAPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
index 414c716..d9099f6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c
@@ -52,12 +52,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1027,11 +1025,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch01000085 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
index 8bda08c..51145bc 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c
@@ -52,12 +52,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1027,11 +1025,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c6 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
index 3f1ec05..d82767c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c
@@ -52,12 +52,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1027,11 +1025,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c7 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
index 46ab18d..bd97100 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c
@@ -52,12 +52,10 @@
 CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1027,11 +1025,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c8 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
index 7b413ac..0f7e3ab 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHtPhyTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
index 3f99c9d..b4cb9a4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCHwC1e.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCHWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,7 +79,6 @@ F10InitializeHwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
index f77841c..d0fe1fb 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCMsrTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevCMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
index 266dd21..3dc7250 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
index 104d3a1..f55c117 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCSwC1e.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCSWC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -80,7 +77,6 @@ F10InitializeSwC1eOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
index dd87ad3..9aeac7b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10RevCUtilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_F10REVCUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
index 0f773a2..7756489 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbEquivalenceTable.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
index 646ab56..62cdeca 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
index bca98a4..7d9425b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbLogicalIdTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
index d4c65d1..5eff60f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMicrocodePatchTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
index 9c6b0c3..6834336 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbMsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RbMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
index 35042a2..68c6229 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/RB/F10RbPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVC_RB_F10RBPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
index 81e2c58..b020da0 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c
@@ -54,12 +54,10 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1029,11 +1027,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000c5 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c
index c47c988..627c339 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c
@@ -53,12 +53,10 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1029,11 +1027,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000d9 =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
index 1467537..05619b1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDMsgBasedC1e.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDMSGBASEDC1E_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ IsDramScrubberEnabled (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
index 2b1efc6..304e870 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10RevDUtilities.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_F10REVDUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -133,7 +130,6 @@ F10CommonRevDGetNumberOfPhysicalCores (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
index 1b4a1b8..b56e2ff 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyEquivalenceTable.c
@@ -54,17 +54,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,7 +74,6 @@ GetF10HyMicrocodeEquivalenceTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF10HyMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
index 02f65c9..00fc26b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
index c5afa3a..a2d67d5 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyInitEarlyTable.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -85,7 +82,6 @@ GetF10HyEarlyInitOnCoreTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
index 79339a8..22e765d 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyLogicalIdTables.c
@@ -54,17 +54,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,7 +74,6 @@ GetF10HyLogicalIdAndRev (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
index a924bbd..bff320b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMicrocodePatchTables.c
@@ -56,12 +56,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +68,6 @@ extern CONST MICROCODE_PATCHES ROMDATA *CpuF10HyMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF10HyNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ GetF10HyMicroCodePatchesStruct (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
index 83094bd..acf282e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyMsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10HyMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
index d1fa49d..107c52f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/HY/F10HyPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVD_HY_F10HYPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
index 9a9ea08..05e3e95 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c
@@ -54,12 +54,10 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -1029,11 +1027,9 @@ CONST MICROCODE_PATCHES ROMDATA CpuF10MicrocodePatch010000bf =
 }};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
index 52630d9..7362080 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
index 59cce83..1edffcb 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEMsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10RevEMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
index ab5e1fe..8dc6bf4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEPciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
index 476ae27..ce4f9ad 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10RevEUtilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_F10REVEUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
index 5f85f5d..14724f8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhEquivalenceTable.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHEQUIVALENCETABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF10PhMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
index f591300..ff64621 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhHtPhyTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHHTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
index 1cd88ca..540ce25 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhLogicalIdTables.c
@@ -54,22 +54,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHLOGICALIDTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
index 6c5ff70..315cb10 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/PH/F10PhMicrocodePatchTables.c
@@ -56,12 +56,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_REVE_PH_F10PHMICROCODEPATCHTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,12 +68,10 @@ extern CONST UINT8 ROMDATA CpuF10PhNumberOfMicrocodePatches;
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
index ea7f20a..746365e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.c
@@ -62,12 +62,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUCOMMONF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /**
@@ -88,12 +86,10 @@ typedef union {
 } NODE_ID_MSR;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
index a09feb1..60e605c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuCommonF10Utilities.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandId.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandId.c
index edda5bc..d6798bc 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandId.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandId.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10BRANDID_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +94,6 @@ extern CONST UINT8 F10BrandIdString1TableCount;
 extern CONST UINT8 F10BrandIdString2TableCount;
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
index 9aaf777..85505d1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAm3.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -188,7 +184,6 @@ CONST CHAR8 ROMDATA str2_F10_Am3_SC_0T[] = "0T Processor";
 CONST CHAR8 ROMDATA str2_F10_Am3_SC_5T[] = "5T Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
index 50e5d03..8bce8f8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdAsb2.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +86,6 @@ CONST CHAR8 ROMDATA str_F10_Asb2_L_Dual_Core_Processor[] = "L Dual-Core Processo
 CONST CHAR8 ROMDATA str_F10_Asb2_H_Dual_Core_Processor[] = "H Dual-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
index c5a6fe1..0384f55 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdC32.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -91,7 +87,6 @@ CONST CHAR8 ROMDATA str2_F10_C32_GL_EE[] = "GL EE";
 CONST CHAR8 ROMDATA str2_F10_C32_CL_EE[] = "CL EE";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
index 4c87430..158bdf2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdFr1207.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -113,7 +109,6 @@ CONST CHAR8 ROMDATA str2_F10_Fr1207_KS_HE[] = "KS HE";
 CONST CHAR8 ROMDATA str2_F10_Fr1207_QCP[] = " Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
index 0df104e..d9b9581 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdG34.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +84,6 @@ CONST CHAR8 ROMDATA str2_F10_G34_KS[] = "KS";
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
index c2f8f69..0cf86d6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g3.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +89,6 @@ CONST CHAR8 ROMDATA str_F10_S1g3_Athlon_II_DC_M3[] = "AMD Athlon(tm) II Dual-Cor
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
index 6ec940e..0144c34 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10BrandIdS1g4.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +86,6 @@ CONST CHAR8 ROMDATA str_F10_S1g4_0_Triple_Core_Processor[] = "0 Triple-Core Proc
 CONST CHAR8 ROMDATA str_F10_S1g4_0_Quad_Core_Processor[] = "0 Quad-Core Processor";
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
index 6ba8ed8..a0e3e20 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheDefaults.c
@@ -57,17 +57,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CACHEDEFAULTS_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -80,7 +77,6 @@ GetF10CacheInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define MEM_TRAINING_BUFFER_SIZE  16384
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
index f48932d..bf06e70 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10CacheFlushOnHalt.c
@@ -78,7 +78,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Cpb.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Cpb.c
index f329b9b..c5b71b3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Cpb.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Cpb.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10CPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Dmi.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Dmi.c
index 641b7e7..376ec63 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Dmi.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Dmi.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10DMI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -110,7 +107,6 @@ F10Translate7BitVidTo6Bit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
index c7fb857..ae00571 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.c
@@ -66,12 +66,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10EARLYINIT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// Enum for handling code branching while transitioning to the
@@ -84,7 +82,6 @@ typedef enum {
 } GO_TO_STEP;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -107,7 +104,6 @@ WaitForCpuFidAndDidToMatch (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
index d031620..e004f17 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10EarlyInit.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
index a282fa6..b3c8180 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10FEATURELEVELING_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -88,7 +85,6 @@ updateCpuFeatureList (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
index d62adcc..49501b9 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10FeatureLeveling.h
@@ -49,19 +49,16 @@
 #include "cpuFamilyTranslation.h"
 #include "cpuPostInit.h"
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// F10 CPU Feature Low
@@ -176,7 +173,6 @@ typedef struct {
   CPU_F10_EXT_FEATURES_HI CpuF10ExtFeaturesHi;  ///< High
 } CPU_F10_EXT_FEATURES;
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
index 14ae439..7ad4928 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10HtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10HTPHYTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10MsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10MsrTables.c
index f4f9923..51dc291 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10MsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10MsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F10MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PciTables.c
index 5ed043f..95e6172 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
index b855b0b..adbf777 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -95,7 +92,6 @@ F10PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
index 7721a28..4843f5c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerCheck.h
@@ -46,19 +46,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -70,7 +67,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
index 866c10b..033a0a3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerMgmtSystemTables.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +86,6 @@ GetF10SysPmTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
index 39a17be..d81d511 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.c
@@ -69,7 +69,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10POWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -108,12 +107,10 @@ CONST UINT32 ROMDATA AltvidSlamTime[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -142,7 +139,6 @@ F10PmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
index d909532..a9ad565 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10PowerPlane.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Pstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Pstate.c
index c8b54e2..242c5a8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Pstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Pstate.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10PSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -155,7 +152,6 @@ F10GetFrequencyXlatRegInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
index a983f08..c01d580 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10SOFTWARETHERMAL_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
index 9dcc44e..ff24c33 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10SoftwareThermal.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.c
index ed2ff50..2098464 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.c
@@ -67,7 +67,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Register encodings for F3xD8[VSRampTime/VSSlamTime]
@@ -87,17 +86,14 @@ extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 extern OPTION_MULTISOCKET_CONFIGURATION    OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.h
index 73d9aa6..01b42c0 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10Utilities.h
@@ -48,19 +48,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -71,7 +68,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
index 393d3bf..aae47ea 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WheaInitDataTables.c
@@ -55,17 +55,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WHEAINITDATATABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,7 +75,6 @@ GetF10WheaInitData (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F10HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
index b955c1f..919973e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/cpuF10WorkaroundsTable.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X10_CPUF10WORKAROUNDSTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -138,7 +135,6 @@ F10RevDSyncInternalNode1SbiAddr (
 }
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PackageType.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PackageType.h
index 5c67a23..7b48a26 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PackageType.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PackageType.h
@@ -46,13 +46,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -66,13 +64,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PstateHpcMode.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PstateHpcMode.c
index 0438459..d872346 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PstateHpcMode.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/F15PstateHpcMode.c
@@ -65,22 +65,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_F15PSTATEHPCMODE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrC6State.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrC6State.c
index 5863af8..42d92ec 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrC6State.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrC6State.c
@@ -67,7 +67,6 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F15_OR_ES_C6_SUPPORT F15OrEarlySampleC6Support;
@@ -75,12 +74,10 @@ extern F15_OR_ES_MCU_PATCH F15OrEarlySampleLoadMcuPatch;
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -89,7 +86,6 @@ F15OrReloadMicrocodePatchAfterMemInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrCpb.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrCpb.c
index f6c9f5f..07cdf34 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrCpb.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrCpb.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F15_OR_ES_CPB_SUPPORT F15OrEarlySampleCpbSupport;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEarlySamples.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEarlySamples.c
index afcea1d..4b47e0f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEarlySamples.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEarlySamples.c
@@ -67,12 +67,10 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15OREARLYSAMPLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -81,7 +79,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -135,7 +132,6 @@ F15OrEarlySamplesLoadMicrocodePatch (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEquivalenceTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEquivalenceTable.c
index 78057a7..0474f74 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrEquivalenceTable.c
@@ -57,17 +57,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -79,7 +76,6 @@ GetF15OrMicrocodeEquivalenceTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF15OrMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrHtPhyTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrHtPhyTables.c
index 2129d59..f60609c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrHtPhyTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrHtPhyTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrInitEarlyTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrInitEarlyTable.c
index 2f0f43e..074a950 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrInitEarlyTable.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -89,7 +86,6 @@ GetF15OrEarlyInitOnCoreTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrIoCstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrIoCstate.c
index 6c94521..0b259d4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrIoCstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrIoCstate.c
@@ -67,7 +67,6 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,14 +83,12 @@ F15OrIsCsdObjGenerated (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            IoCstateFamilyServiceTable;
 extern OPTION_MULTISOCKET_CONFIGURATION    OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLogicalIdTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLogicalIdTables.c
index 158cd80..8d2c131 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLogicalIdTables.c
@@ -55,17 +55,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ GetF15OrLogicalIdAndRev (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLowPwrPstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLowPwrPstate.c
index c2d8bb9..d95422b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLowPwrPstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrLowPwrPstate.c
@@ -65,22 +65,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORLOWPWRPSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c
index 6799398..4b970d3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c
@@ -55,12 +55,10 @@ CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -2665,11 +2663,9 @@ CONST UINT8 ROMDATA CpuF15OrMicrocodePatch06000425 [IDS_PAD_4K] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c
index bb196ef..f1a7df7 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c
@@ -55,12 +55,10 @@ CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -2666,11 +2664,9 @@ CONST UINT8 ROMDATA CpuF15OrMicrocodePatch0600050D_Enc [IDS_PAD_4K] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c
index 68d7c07..b8cb78e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c
@@ -54,12 +54,10 @@ CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -2665,11 +2663,9 @@ CONST UINT8 ROMDATA CpuF15OrMicrocodePatch06000624_Enc [IDS_PAD_4K] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatchTables.c
index 4173492..2e90160 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatchTables.c
@@ -58,19 +58,16 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES_4K ROMDATA *CpuF15OrMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF15OrNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,7 +79,6 @@ GetF15OrMicroCodePatchesStruct (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsgBasedC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsgBasedC1e.c
index f7e148d..391c485 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsgBasedC1e.c
@@ -68,17 +68,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -96,7 +93,6 @@ IsDramScrubberEnabled (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsrTables.c
index b1c09f2..b47a2d9 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMsrTables.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ F15OrDisUcodeWorkaroundForErratum671 (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F15OrMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMultiLinkPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMultiLinkPciTables.c
index 0c9290d..0b1a862 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMultiLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMultiLinkPciTables.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPciTables.c
index ce07817..6610caa 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.c
index b339d2d..044ffdc 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ F15OrPmNbCofVidInitOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.h
index 6965247..8bab88e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPmNbCofVidInit.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerMgmtSystemTables.c
index 7cc2e82..4a66926 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerMgmtSystemTables.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORPOWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -88,7 +85,6 @@ GetF15OrSysPmTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.c
index 317f9d6..7c32ca3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.c
@@ -68,17 +68,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORPOWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -92,7 +89,6 @@ F15OrPmVrmLowPowerModeEnable (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.h
index 8396bf3..a061053 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrPowerPlane.h
@@ -46,25 +46,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSharedMsrTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSharedMsrTable.c
index 311e210..7646cb9 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSharedMsrTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSharedMsrTable.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ F15OrFpCfgInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F15OrSharedMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSingleLinkPciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSingleLinkPciTables.c
index 5df3ffa..33debcb 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSingleLinkPciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrSingleLinkPciTables.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.c
index ed2e460..1df53e0 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.c
@@ -64,12 +64,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -91,7 +89,6 @@ typedef union {
 } NODE_ID_MSR;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -113,7 +110,6 @@ F15OrSetDownCoreRegister (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.h
index a52491a..23a0969 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrUtilities.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrWorkaroundsTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrWorkaroundsTable.c
index 7ee0a2d..4917be2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrWorkaroundsTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrWorkaroundsTable.c
@@ -60,22 +60,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_F15ORWORKAROUNDSTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCacheFlushOnHalt.c
index 1692eb9..511b56a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCacheFlushOnHalt.c
@@ -82,7 +82,6 @@ extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.c
index 4e76351..d44f1b0 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_CPUF15ORCOREAFTERRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ F15OrPmCoreAfterResetPhase2OnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.h
index a2a3e74..e4ae52d 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrCoreAfterReset.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrDmi.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrDmi.c
index 36824c1..2f2ba94 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrDmi.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrDmi.c
@@ -64,13 +64,11 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA str_Opteron_62[] = "AMD Opteron(tm) Processor 62";
@@ -99,7 +97,6 @@ CONST CPU_T4_PROC_FAMILY ROMDATA F15OrAM3T4ProcFamily[] =
   {str_Opteron_3, 0xE4}
 };
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -133,7 +130,6 @@ DmiF15OrGetExtClock (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.c
index b1aa42f..c7357dc 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_CPUF15ORFEATURELEVELING_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -88,7 +85,6 @@ updateCpuFeatureList (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.h
index dd644d6..f9baffa 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrFeatureLeveling.h
@@ -49,19 +49,16 @@
 #include "cpuFamilyTranslation.h"
 #include "cpuPostInit.h"
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// F15 Orochi CPU Feature Low
@@ -192,7 +189,6 @@ typedef struct {
   CPU_F15_OR_EXT_FEATURES_HI CpuF15OrExtFeaturesHi;  ///< High
 } CPU_F15_OR_EXT_FEATURES;
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.c
index 0d6b115..1a74b20 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_OR_CPUF15ORNBAFTERRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -108,7 +105,6 @@ WaitForNbTransitionToComplete (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.h
index 710d43d..ef2eb62 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrNbAfterReset.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrPstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrPstate.c
index 4a2251a..c926f11 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrPstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrPstate.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -158,7 +155,6 @@ F15OrGetPstateRegisterInfo (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.c
index cd0dc48..4ab163f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.c
@@ -65,24 +65,20 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern F15_OR_ES_CORE_SUPPORT F15OrEarlySampleCoreSupport;
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.h
index 130c73d..4a07661 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/cpuF15OrSoftwareThermal.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
index 7cd57a1..b94f066 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h
index 27c8768..1934a73 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 CORE_ID_POSITION
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Apm.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Apm.c
index dba9b71..5bce8ca 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Apm.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Apm.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15APM_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15BrandId.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15BrandId.c
index 0450263..56b65da 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15BrandId.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15BrandId.c
@@ -62,7 +62,6 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NAME_STRING_ADDRESS_PORT 0x194
@@ -70,7 +69,6 @@ RDATA_GROUP (G3_DXE)
 
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// A structure containing brand string
@@ -85,7 +83,6 @@ typedef struct _PROCESSOR_NAME_STRING {
 } PROCESSOR_NAME_STRING;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -102,7 +99,6 @@ F15SetBrandIdRegistersAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 // This is an example, need to be updated once Processor Revision Guide define brand string exception
@@ -110,7 +106,6 @@ F15SetBrandIdRegistersAtEarly (
 CONST CHAR8 ROMDATA str_Exception_0[48] = "AMD Phenom(tm) Octal-Core";
 CONST CHAR8 ROMDATA str_Unprogrammed_Sample[48] = "AMD Unprogrammed Engineering Sample";
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 CONST CPU_F15_EXCEPTION_BRAND ROMDATA CpuF15ExceptionBrandIdString[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
index df868ff..712b5a4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ GetF15CacheInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define MEM_TRAINING_BUFFER_SIZE  16384
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.c
index 90c2ca5..1eb82f2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.c
@@ -62,23 +62,19 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.h
index f7894ff..4151904 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Dmi.h
@@ -47,24 +47,20 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15MsrTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15MsrTables.c
index e914029..aea974b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15MsrTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15MsrTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F15MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PciTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PciTables.c
index c0085c7..b54bb95 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PciTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PciTables.c
@@ -56,22 +56,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.c
index 6242410..ffedd5a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -108,7 +105,6 @@ F15PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.h
index ece2f36..cc91776 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15PowerCheck.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -70,7 +67,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.c
index b1aa92b..630ad5a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.c
@@ -67,7 +67,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -82,7 +81,6 @@ extern OPTION_MULTISOCKET_CONFIGURATION    OptionMultiSocketConfiguration;
 #define HT_PHY_LINK_PHY_RECEIVER_PROCESS_DLL_CONTROL_SL1 0x530F
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -155,12 +153,10 @@ CONST STATIC HT_PHY_DLL_COMP_LOOKUP_TABLE ROMDATA HtPhyDllCompLookupTable[] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.h
index f7d6bb6..ad724f4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15Utilities.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -69,7 +66,6 @@ typedef struct {
 } SW_VOLT_TRANS_NB;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
index 2f8a905..5239723 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
@@ -55,17 +55,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ GetF15WheaInitData (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F15HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/cpuFamRegisters.h
index 4800a23..f4d892f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/cpuFamRegisters.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/cpuFamRegisters.h
@@ -57,7 +57,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.c
index c8e7c3a..eb66145 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.c
@@ -67,22 +67,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_FEATURE_PRESERVEMAILBOX_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PreserveMailboxFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.h
index a4af7ad..e62c7bd 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/PreserveMailbox.h
@@ -47,7 +47,6 @@
 #define _PRESERVE_MAILBOX_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #define MAX_PRESERVE_REGISTER_ENTRIES 2      ///< There is room on the heap for up to this per node.
@@ -56,12 +55,10 @@
 typedef UINT32 (*MAILBOX_REGISTER_SAVE_ENTRY) [MAX_PRESERVE_REGISTER_ENTRIES];
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.c
index 733175d..c7e22d9 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPUAPM_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ EnableApmOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE ApmFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.h
index 4aad695..1964cef 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuApm.h
@@ -46,19 +46,16 @@
 #define _CPU_APM_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (APM_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.c
index 89426e4..249199e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPUC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -88,7 +85,6 @@ EnableC6OnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE C6FamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.h
index c6a6179..01e65d5 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuC6State.h
@@ -46,19 +46,16 @@
 #define _CPU_C6_STATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (C6_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index c99c757..f2c2dec 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CacheFlushOnHaltFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCoreLeveling.c
index ddfeb68..f2c2bbc 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -78,7 +78,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CoreLevelingFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.c
index 1aa82e6..49e15a1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPUCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpbFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.h
index a39cbb4..ad24e97 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuCpb.h
@@ -46,19 +46,16 @@
 #define _CPU_CPB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPB_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c
index 2385752..9fbf7e4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuDmi.c
@@ -62,18 +62,15 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUDMI_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
@@ -114,7 +111,6 @@ ReleaseDmiBuffer (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatureLeveling.c
index 294a18d..b97d3e2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -78,7 +78,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.c
index fa87380..a09cbd1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.c
@@ -55,22 +55,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPUFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 extern CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[];
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.h
index f666153..2c94a42 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuFeatures.h
@@ -141,17 +141,14 @@
 
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 #define CPU_FEAT_BEFORE_PM_INIT           (0x0000000000000001ull)
@@ -244,7 +241,6 @@ typedef struct {
 } CPU_FEATURE_TABLE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.c
index ab9a46e..4d027f6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_FEATURE_CPUHWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE HwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.h
index 77a525d..d662052 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuHwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_HW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.c
index ff5d442..b9439e6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPUIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +81,6 @@ EnableIoCstateOnSocket (
   IN       AMD_CPU_EARLY_PARAMS *CpuEarlyParams
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE    IoCstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.h
index 998b6b8..42c861e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuIoCstate.h
@@ -45,14 +45,12 @@
 #define _CPU_IO_CSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Defines for ACPI C-State Objects
@@ -75,7 +73,6 @@ AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 #define   CSD_COORD_TYPE_HW_ALL 0xFE
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /* AML code definition */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuL3Features.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuL3Features.h
index ff75b19..983dc79 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuL3Features.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuL3Features.h
@@ -48,21 +48,18 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (L3_FEATURE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_DISABLE_CACHE (0x00000000 | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 #define AP_LATE_TASK_ENABLE_CACHE  (0x00010000 | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 #define L3_SCRUBBER_CONTEXT_ARRAY_SIZE 4
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.c
index 8d835cf..cde1cba 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPULOWPWRPSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ EnableLowPwrPstateOnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE LowPwrPstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.h
index 0ba0bb6..4433db8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuLowPwrPstate.h
@@ -46,19 +46,16 @@
 #define _CPU_LOW_PWR_PSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (LOW_PWR_PSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.c
index cf938fc..315882a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_FEATURE_CPUMSGBASEDC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ EnableMsgC1eOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE MsgBasedC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.h
index a5aac1e..c7e186f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuMsgBasedC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_MSG_BASED_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MSG_BASED_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.c
index beab990..6e8536c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FEATURE_CPUPSTATEHPCMODE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ EnablePstateHpcModeOnAps (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PstateHpcModeFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.h
index 52cb395..37e22ef 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateHpcMode.h
@@ -46,18 +46,15 @@
 #define _CPU_PSTATE_HPC_MODE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (PSTATE_HPC_MODE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateTables.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateTables.h
index b75ea3e..ce4487f 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateTables.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuPstateTables.h
@@ -46,19 +46,16 @@
 #define _CPU_PSTATE_TABLES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSTATE_CPU_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// P-state structure for each state
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSlit.c
index 2642a1f..e938528 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSlit.c
@@ -69,7 +69,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSLIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,12 +88,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuSlitHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -105,7 +102,6 @@ AcpiSlitHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -133,7 +129,6 @@ ReleaseSlitBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSrat.c
index b4d0e0f..1ad033c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSrat.c
@@ -66,7 +66,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config record
@@ -75,7 +74,6 @@ extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config
 #define FOURGB 0x010000
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -111,7 +109,6 @@ STATIC CPU_SRAT_HEADER  ROMDATA CpuSratHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
@@ -143,7 +140,6 @@ STATIC
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.c
index f791e1a..926ffdd 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE SwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.h
index a7806a0..04ea50a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuSwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_SW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (SW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuWhea.c
index 1275d8d..fa62864 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Feature/cpuWhea.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUWHEA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 extern OPTION_WHEA_CONFIGURATION OptionWheaConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ GetAcpiWheaMain (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.c
index c055f5b..d95e115 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.c
@@ -62,19 +62,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_S3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -150,7 +147,6 @@ RestoreConditionalMsrDevice (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.h
index decac8a..c6f1f07 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/S3.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define RESTART_FROM_BEGINNING_LIST 0xFFFFFFFF
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -317,7 +314,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/Table.c
index c1b25cb..7a0009e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/Table.c
@@ -69,17 +69,14 @@ RDATA_GROUP (G2_PEI)
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -90,7 +87,6 @@ SetRegistersFromTablesAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cahalt.c
index 68ca272..29572ab 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cahalt.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 
  /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 // typedef unsigned int   uintptr_t;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ ExecuteWbinvdInstruction (
   );
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.c
index f6d452e..329abf3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_CPUAPICUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /* ApFlags bits */
@@ -77,7 +76,6 @@ RDATA_GROUP (G2_PEI)
 #define XFER_ELEMENT_SIZE    sizeof (UINT32)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +85,6 @@ typedef VOID F_CPU_AMD_NMI_HANDLER (
 typedef F_CPU_AMD_NMI_HANDLER *PF_CPU_AMD_NMI_HANDLER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -177,7 +174,6 @@ LocalApicInitializationAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.h
index 464dcfb..ff67c76 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuApicUtilities.h
@@ -48,13 +48,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define APIC_CTRL_DWORD 0xF
@@ -116,7 +114,6 @@
 #define IDT_DESC_TYPE_INT32  0x0E
 #define IDT_DESC_TYPE_TRAP32 0x0F
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID (*PF_AP_TASK) (AMD_CONFIG_PARAMS *StdHeader);
@@ -190,7 +187,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 //                   These are   P U B L I C   functions, used by AGESA
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBist.c
index 95c4d7f..fef9d48 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBist.c
@@ -60,7 +60,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_CPUBIST_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,7 +70,6 @@ GetBistResults (
   );
 
  /*----------------------------------------------------------------------------------------
-  *                          E X P O R T E D    F U N C T I O N S
   *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBrandId.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBrandId.c
index 2d5f1df..aa9bcf9 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBrandId.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuBrandId.c
@@ -60,12 +60,10 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_CPUBRANDID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA strEngSample[] = "AMD Engineering Sample";
@@ -79,7 +77,6 @@ CONST AMD_CPU_BRAND ROMDATA Dflt_Str2 = {0, 0, 0, SOCKET_IGNORE, DR_NO_STRING, D
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -90,7 +87,6 @@ SetBrandIdRegistersAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.c
index 60e460f..1cfb827 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -95,7 +92,6 @@ McaInitializationAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.h
index c83fb07..0c81e31 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEarlyInit.h
@@ -48,13 +48,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -112,7 +110,6 @@ typedef struct {
 #define MICROCODE_PATCH_2K_SIZE    2048
 #define MICROCODE_PATCH_4K_SIZE    4096
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -242,7 +239,6 @@ struct _CPU_CORE_LEVELING_FAMILY_SERVICES {             // See Forward Declarati
 
 #define PERFORM_EARLY_ANY_CONDITION 0xFFFFFFFF // the related function always needs to be run
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEnvInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEnvInit.h
index 4348687..0946eb8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEnvInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEnvInit.h
@@ -46,22 +46,18 @@
 #define _CPU_ENV_INIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 // HobTransfer
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEventLog.c
index 98d818c..2e39af2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuEventLog.c
@@ -58,13 +58,11 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUEVENTLOG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define TOTAL_EVENT_LOG_BUFFERS  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +86,6 @@ typedef struct {
 } AGESA_STRUCT_BUFFER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.c
index 8c9e969..02e6966 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.c
@@ -60,12 +60,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_CPUFAMILYTRANSLATION_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -113,7 +111,6 @@ CONST CPU_SPECIFIC_SERVICES ROMDATA cpuNullServices =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -126,7 +123,6 @@ GetCpuServices (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpuSupportedFamiliesTable;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.h
index 4cb929b..9e4f01c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuFamilyTranslation.h
@@ -130,7 +130,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 #include "cpuPostInit.h"
@@ -144,12 +143,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (CPU_SPECIFIC_SERVICES);
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -897,7 +894,6 @@ typedef struct {
 } CPU_FAMILY_ID_XLAT_TABLE;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuGeneralServices.c
index 6825b00..2ce8ae5 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuGeneralServices.c
@@ -65,24 +65,20 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUGENERALSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTIONS_CONFIG_TOPOLOGY TopologyConfiguration;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 
@@ -186,7 +182,6 @@ AmdIdentifyCore (
 }
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - AGESA common General Services
  *----------------------------------------------------------------------------------------
  */
 
@@ -317,7 +312,6 @@ IdentifyCore (
 
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - cpu component General Services
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuInitEarlyTable.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuInitEarlyTable.c
index 53bc946..c0d5c6c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuInitEarlyTable.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ GetCommonEarlyInitOnCoreTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.c
index 30c6a7e..a82625d 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_CPULATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ DisableCf8ExtCfg (
   IN       AMD_CONFIG_PARAMS   *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.h
index 050ec53..0680f5e 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuLateInit.h
@@ -51,12 +51,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (PROC_FAMILY_TABLE);
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -335,7 +333,6 @@ CpuLateInitApTask (
 #define     PSTATE_FLAG_2           0xAA
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -805,7 +802,6 @@ typedef struct _CPU_SRAT_MEMORY_ENTRY {
 } CPU_SRAT_MEMORY_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuMicrocodePatch.c
index d76a372..8d93aec 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuMicrocodePatch.c
@@ -61,13 +61,11 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUMICROCODEPATCH_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -76,7 +74,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -94,7 +91,6 @@ LoadMicrocodePatchAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.c
index 466e0c4..7db09ba 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.c
@@ -71,17 +71,14 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_CPUPOSTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -91,7 +88,6 @@ SyncVariableMTRR (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.h
index ba63768..c9960a6 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPostInit.h
@@ -48,20 +48,17 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPU_CFOH_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define P_STATE_DATA_GATHER_TEMP_ADDR     0x200000 ///< Fixed the row data at 2M memory address.
 #define GLOBAL_CPU_FEATURE_LIST_TEMP_ADDR 0x200000 ///< Fixed the row data at 2M memory address.
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -185,7 +182,6 @@ struct _CPU_CFOH_FAMILY_SERVICES {                     // See forward reference
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmt.c
index 8cfa58d..dba6079 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmt.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -99,7 +96,6 @@ GoToMemInitPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.c
index 2e465f6..09e31fc 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTMULTISOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -86,7 +83,6 @@ GetNextEvent (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.h
index 78f5ce7..07a48f3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtMultiSocket.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.c
index 1d42943..d153742 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -62,22 +62,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTSINGLESOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.h
index 11b71ff..49dbcfb 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSingleSocket.h
@@ -48,25 +48,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSystemTables.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSystemTables.h
index b400236..87769e1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSystemTables.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuPowerMgmtSystemTables.h
@@ -46,13 +46,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define PM_EXEFLAGS_WARM_ONLY    0x00000001   /* Skip step if set && cold reset */
@@ -62,7 +60,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID F_PM_STEP_FUNCTION (
@@ -84,7 +81,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuRegisters.h
index e0959fc..3aa3f43 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuRegisters.h
@@ -58,7 +58,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
@@ -377,7 +376,6 @@ typedef struct {
 /*
  * --------------------------------------------------------------------------------------
  *
- *             D E F I N E S    /   T Y P E D E F S   /  S T R U C T U R E S
  *
  * --------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuServices.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuServices.h
index f51d41f..2a8abee 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuServices.h
@@ -46,12 +46,10 @@
 #define _CPU_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
  /// WARM RESET STATE_BITS
@@ -61,7 +59,6 @@
 #define WR_STATE_POST  03
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -134,7 +131,6 @@ typedef struct _WARM_RESET_REQUEST {
   UINT8             Reserved:(8 - 5);                   ///< Reserved
 } WARM_RESET_REQUEST;
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuWarmReset.c
index 28d11ff..e7e82fd 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/cpuWarmReset.c
@@ -58,22 +58,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_CPUWARMRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -143,7 +139,6 @@ GetWarmResetFlag (
   }
 }
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.c
index f42c35d..88c3fb3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.c
@@ -62,19 +62,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_CPU_HEAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
@@ -103,7 +100,6 @@ InsertFreeSpaceNode (
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.h b/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.h
index f933dee..735be8b 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/CPU/heapManager.h
@@ -47,13 +47,11 @@
 #define _HEAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define AMD_MTRR_VARIABLE_BASE0 0x200
@@ -111,7 +109,6 @@
 #define AMD_MTRR_FIX4K_UC_DRAM   0x1818181818181818
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Allocate Heap Parameters
@@ -204,7 +201,6 @@ typedef enum {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEarly.c
index 090009b..0ce6237 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEarly.c
@@ -66,13 +66,11 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDINITEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitExeCacheMap[] =
@@ -83,7 +81,6 @@ EXECUTION_CACHE_REGION InitExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -99,7 +96,6 @@ AllocateExecutionCacheInitializer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEnv.c
index 4fdbda1..89862f4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitEnv.c
@@ -65,25 +65,21 @@ RDATA_GROUP (G2_PEI)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitLate.c
index a62af89..d270e46 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitLate.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDINITLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
@@ -73,13 +72,11 @@ extern OPTION_SLIT_CONFIGURATION   OptionSlitConfiguration; // global user confi
 extern OPTION_PSTATE_LATE_CONFIGURATION OptionPstateLateConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -89,7 +86,6 @@ AmdLatePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitMid.c
index 0362054..ae849c4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitMid.c
@@ -64,25 +64,21 @@ RDATA_GROUP (G3_DXE)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitPost.c
index 415b33d..c04f8d2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitPost.c
@@ -66,19 +66,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDINITPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -89,7 +86,6 @@ AmdPostPlatformConfigInit (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitRecovery.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitRecovery.c
index ac4c08d..009cca4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitRecovery.c
@@ -62,12 +62,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_COMMON_AMDINITRECOVERY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c
index 7013f67..5a140ae 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c
@@ -67,19 +67,16 @@ RDATA_GROUP (G2_PEI)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST OPTION_HT_INIT_RESET HtOptionInitReset;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -90,7 +87,6 @@ AmdInitResetExecutionCacheAllocateInitializer (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitResume.c
index 02d85ac..0ac156a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitResume.c
@@ -67,25 +67,21 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDINITRESUME_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdLateRunApTask.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdLateRunApTask.c
index b11fca2..4bd7e5c 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdLateRunApTask.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdLateRunApTask.c
@@ -57,25 +57,21 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDLATERUNAPTASK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE ApDispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c
index e293d46..1a2ebe2 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c
@@ -62,19 +62,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDS3LATERESTORE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -84,7 +81,6 @@ AmdS3LateRestorePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c
index 59059a3..8706af8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c
@@ -67,13 +67,11 @@ RDATA_GROUP (G3_DXE)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT32 ROMDATA S3LateHeapTable[] =
@@ -91,7 +89,6 @@ CONST UINT32 ROMDATA S3LateHeapTable[] =
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -101,7 +98,6 @@ AmdS3SavePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f15/Proc/Common/CommonInits.c
index 5e52f3c..f4c8e31 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/CommonInits.c
@@ -57,24 +57,20 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_COMMONINITS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/CommonReturns.c b/src/vendorcode/amd/agesa/f15/Proc/Common/CommonReturns.c
index 8c79f9e..9ddce12 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/CommonReturns.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/CommonReturns.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f15/Proc/Common/CreateStruct.c
index ad007e4..c99658a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/CreateStruct.c
@@ -60,24 +60,20 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_CREATESTRUCT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST FUNCTION_PARAMS_INFO FuncParamsInfo[];
 extern CONST UINTN InitializerCount;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f15/Proc/Common/S3RestoreState.c
index 5f00ec5..5000617 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/S3RestoreState.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_S3RESTORESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 extern S3_SCRIPT_CONFIGURATION    OptionS3ScriptConfiguration;
 extern S3_DISPATCH_FUNCTION_ENTRY S3DispatchFunctionTable[];
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f15/Proc/Common/S3SaveState.c
index dacef86..216cd2a 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/S3SaveState.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_S3SAVESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/mu.c
index 00e1308..8a6a7cb 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Mem/Main/mu.c
@@ -63,17 +63,14 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -115,7 +112,6 @@ AlignPointerTo16Byte (
 */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.c b/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.c
index 4593c60..35ee2a4 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.c
@@ -59,22 +59,18 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_RECOVERY_CPU_CPURECOVERY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.h b/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.h
index a0fe607..44630b8 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.h
+++ b/src/vendorcode/amd/agesa/f15/Proc/Recovery/CPU/cpuRecovery.h
@@ -47,22 +47,18 @@
 #define _CPU_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/GeneralServices.h b/src/vendorcode/amd/agesa/f15tn/Include/GeneralServices.h
index 5fa4a89..cb7e7f2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/GeneralServices.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/GeneralServices.h
@@ -47,12 +47,10 @@
 #define _GENERAL_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NUMBER_OF_EVENT_DATA_PARAMS 4
@@ -64,7 +62,6 @@
 #define AMD_DEV_VEN_ID_ADDRESS 0
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct {
 } AGESA_EVENT;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionDmi.h
index 6dba872..ab5e442 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionDmi.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionDmi.h
@@ -45,18 +45,15 @@
 #define _OPTION_DMI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct  {
 } OPTION_DMI_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecovery.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecovery.h
index a1f4d03..90db050 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecovery.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecovery.h
@@ -45,18 +45,15 @@
 #define _OPTION_GFX_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,7 +70,6 @@ typedef struct  {
 } OPTION_GFX_RECOVERY_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionGnb.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionGnb.h
index d439fc4..b0bbf21 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionGnb.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionGnb.h
@@ -45,18 +45,15 @@
 #define _OPTION_GNB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -115,7 +112,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h
index 2494ba9..b162fbe 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h
@@ -51,19 +51,16 @@
 #include <Proc/Mem/ma.h>
 #include <Proc/Mem/mp.h>
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MAX_FF_TYPES      6   ///< Maximum number of DDR Form factors (UDIMMs, RDIMMMs, SODIMMS) supported
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -313,7 +310,6 @@ typedef struct _MEM_PSC_FLOW_BLOCK {
 } MEM_PSC_FLOW_BLOCK;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 /* Feature Default Return */
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocket.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocket.h
index d343bd9..3e28dc5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocket.h
@@ -45,18 +45,15 @@
 #define _OPTION_MULTISOCKET_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -207,7 +204,6 @@ typedef struct  {
 } OPTION_MULTISOCKET_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h
index 2b576b1..95694ec 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h
@@ -47,17 +47,14 @@
 #include <Proc/CPU/Feature/cpuPstateTables.h>
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -108,7 +105,6 @@ typedef struct  {
 } OPTION_PSTATE_LATE_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionSlit.h
index 1dfc957..8755308 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionSlit.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionSlit.h
@@ -45,18 +45,15 @@
 #define _OPTION_SLIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +85,6 @@ typedef struct  {
 } OPTION_SLIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionSrat.h
index 890ea34..1e50016 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionSrat.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionSrat.h
@@ -45,18 +45,15 @@
 #define _OPTION_SRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +71,6 @@ typedef struct  {
 } OPTION_SRAT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionWhea.h
index fcaa23e..86cd41c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionWhea.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionWhea.h
@@ -45,18 +45,15 @@
 #define _OPTION_WHEA_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +72,6 @@ typedef struct  {
 } OPTION_WHEA_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionsHt.h
index 291bd3d..0f7ae58 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionsHt.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionsHt.h
@@ -46,18 +46,15 @@
 #define _OPTION_HT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -102,7 +99,6 @@ typedef struct {
 } OPTION_HT_INIT_RESET;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/agesa/f15tn/Include/PlatformMemoryConfiguration.h
index 094a3ae..d4f33da 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/PlatformMemoryConfiguration.h
@@ -45,7 +45,6 @@
 #define _PLATFORM_MEMORY_CONFIGURATION_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #ifndef PSO_ENTRY
@@ -53,11 +52,9 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c
index b307706..f234cf4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c
@@ -56,7 +56,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LEGACY_PROC_DISPATCHER_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE DispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/agesaCallouts.c
index 1df58aa..896476f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/agesaCallouts.c
@@ -59,28 +59,23 @@
 #include "FchPlatform.h"
 #define FILECODE LEGACY_PROC_AGESACALLOUTS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/hobTransfer.c
index 7ed5f16..ba51951 100644
--- a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/hobTransfer.c
@@ -63,18 +63,15 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE LEGACY_PROC_HOBTRANSFER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,7 +81,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Lib/amdlib.c b/src/vendorcode/amd/agesa/f15tn/Lib/amdlib.c
index 1e2e349..b3819be 100644
--- a/src/vendorcode/amd/agesa/f15tn/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Lib/amdlib.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LIB_AMDLIB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -108,7 +105,6 @@ ReadNumberOfCpuCores(
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/F15PstateHpcMode.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/F15PstateHpcMode.c
index d37cd7e..e996349 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/F15PstateHpcMode.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/F15PstateHpcMode.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_F15PSTATEHPCMODE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnC6State.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnC6State.c
index b2f4160..633c9c4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnC6State.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnC6State.c
@@ -65,18 +65,15 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_F15TNC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ F15TnReloadMicrocodePatchAfterMemInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnCpb.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnCpb.c
index c7efe43..dea99a2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnCpb.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnCpb.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_F15TNCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnEquivalenceTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnEquivalenceTable.c
index b0b12b8..fa6434f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnEquivalenceTable.c
@@ -56,17 +56,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -78,7 +75,6 @@ GetF15TnMicrocodeEquivalenceTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA CpuF15TnMicrocodeEquivalenceTable[] =
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnInitEarlyTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnInitEarlyTable.c
index d95edf3..fd38c7a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnInitEarlyTable.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -105,7 +102,6 @@ F15TnNbPstateForceBeforeApLaunchAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE SetRegistersFromTablesAtEarly;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnIoCstate.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnIoCstate.c
index a9ad343..e036713 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnIoCstate.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnIoCstate.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_F15TNIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,13 +81,11 @@ F15TnIsCsdObjGenerated (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            IoCstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c
index 9dd8465..a7b4b6a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c
@@ -54,17 +54,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -76,7 +73,6 @@ GetF15TnLogicalIdAndRev (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c
index 8e0ada0..6d26d79 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c
@@ -54,12 +54,10 @@ CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -2665,11 +2663,9 @@ CONST UINT8 ROMDATA CpuF15TnMicrocodePatch0600110F_Enc [IDS_PAD_4K] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatchTables.c
index c0ca136..3293658 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatchTables.c
@@ -57,19 +57,16 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES_4K ROMDATA *CpuF15TnMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF15TnNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ GetF15TnMicroCodePatchesStruct (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMsrTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMsrTables.c
index 44bde6a..94ddac4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMsrTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMsrTables.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -86,7 +83,6 @@ SetForceSmcCheckFlwStDis (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F15TnMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPackageType.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPackageType.h
index c601d54..2975b2b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPackageType.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPackageType.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
@@ -62,13 +60,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPciTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPciTables.c
index 59fe8c1..8150e2b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPciTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPciTables.c
@@ -57,17 +57,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -93,7 +90,6 @@ Erratum712Workaround (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerMgmtSystemTables.c
index 2f14618..0b45637 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerMgmtSystemTables.c
@@ -63,17 +63,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_F15TNPOWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ GetF15TnSysPmTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.c
index 16487bf..52edf52 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.c
@@ -66,7 +66,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_F15TNPOWERPLANE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -84,17 +83,14 @@ STATIC CONST UINT32 ROMDATA F15TnVSRampSlamWaitTimes[8] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.h
index aa26a64..7a0315b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnPowerPlane.h
@@ -45,25 +45,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnSharedMsrTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnSharedMsrTable.c
index 2412924..47f3030 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnSharedMsrTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnSharedMsrTable.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -86,7 +83,6 @@ Update800MHzHtcPstateTo900MHz (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F15TnSharedMsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.c
index 57ca08b..c54e1af 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_F15TNUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -143,7 +140,6 @@ F15TnSetDownCoreRegister (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.h
index 16ef149..c82678c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnUtilities.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCacheFlushOnHalt.c
index 3be52d3..92563bf 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCacheFlushOnHalt.c
@@ -79,7 +79,6 @@ RDATA_GROUP (G3_DXE)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.c
index 45586c4..5140d9f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_CPUF15TNCOREAFTERRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -92,7 +89,6 @@ F15TnPmCoreAfterResetPhase2OnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.h
index 2c8c98d..bf83c10 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnCoreAfterReset.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnDmi.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnDmi.c
index 7b7fa0d..0cad269 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnDmi.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnDmi.c
@@ -63,13 +63,11 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA str_A10[] = "AMD A10-";
@@ -119,7 +117,6 @@ CONST CPU_T4_PROC_FAMILY ROMDATA F15TnFM2T4ProcFamily[] =
   {str_Sempron, 0x85},
 };
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -153,7 +150,6 @@ DmiF15TnGetExtClock (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnHtc.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnHtc.c
index aaa7e0b..398c8e5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnHtc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnHtc.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_CPUF15TNHTC_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +86,6 @@ F15TnHtcInit (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION   OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.c
index d3aaab0..52c6149 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_CPUF15TNNBAFTERRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -109,7 +106,6 @@ WaitForNbTransitionToComplete (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.h
index 8a6cd6a..a602515 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnNbAfterReset.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.c
index 27bc273..4f9d358 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_CPUF15TNPOWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -95,7 +92,6 @@ F15TnPmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.h
index af1d7db..ef52332 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPowerCheck.h
@@ -45,24 +45,20 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPsi.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPsi.c
index aab62e0..cff39b5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPsi.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPsi.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_TN_CPUF15TNPSI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -89,7 +86,6 @@ F15TnPmVrmLowPowerModeEnable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION   OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPstate.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPstate.c
index ab99ba1..22f6ed3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPstate.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/cpuF15TnPstate.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -151,7 +148,6 @@ F15TnGetPstateRegisterInfo (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
index 7cd57a1..b94f066 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.c
@@ -64,22 +64,18 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h
index 27c8768..1934a73 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuCommonF15Utilities.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 CORE_ID_POSITION
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Apm.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Apm.c
index dba9b71..5bce8ca 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Apm.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Apm.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15APM_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15BrandId.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15BrandId.c
index 0450263..56b65da 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15BrandId.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15BrandId.c
@@ -62,7 +62,6 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NAME_STRING_ADDRESS_PORT 0x194
@@ -70,7 +69,6 @@ RDATA_GROUP (G3_DXE)
 
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// A structure containing brand string
@@ -85,7 +83,6 @@ typedef struct _PROCESSOR_NAME_STRING {
 } PROCESSOR_NAME_STRING;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -102,7 +99,6 @@ F15SetBrandIdRegistersAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 // This is an example, need to be updated once Processor Revision Guide define brand string exception
@@ -110,7 +106,6 @@ F15SetBrandIdRegistersAtEarly (
 CONST CHAR8 ROMDATA str_Exception_0[48] = "AMD Phenom(tm) Octal-Core";
 CONST CHAR8 ROMDATA str_Unprogrammed_Sample[48] = "AMD Unprogrammed Engineering Sample";
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 CONST CPU_F15_EXCEPTION_BRAND ROMDATA CpuF15ExceptionBrandIdString[] =
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
index df868ff..712b5a4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15CacheDefaults.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ GetF15CacheInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define MEM_TRAINING_BUFFER_SIZE  16384
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Crat.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Crat.c
index 42498fc..02896f8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Crat.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Crat.c
@@ -61,23 +61,19 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 extern CONST UINT8 ROMDATA L2L3Associativity[];
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.c
index 90c2ca5..1eb82f2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.c
@@ -62,23 +62,19 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.h
index f7894ff..4151904 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Dmi.h
@@ -47,24 +47,20 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.c
index 77f0b65..1fd3b2f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.c
@@ -61,24 +61,20 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15MMIOMAP_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA MmioBaseLowRegOffset[MMIO_REG_PAIR_NUM] = {0x80, 0x88, 0x90, 0x98, 0xA0, 0xA8, 0xB0, 0xB8, 0x1A0, 0x1A8, 0x1B0, 0x1B8};
 STATIC CONST UINT16 ROMDATA MmioLimitLowRegOffset[MMIO_REG_PAIR_NUM] = {0x84, 0x8C, 0x94, 0x9C, 0xA4, 0xAC, 0xB4, 0xBC, 0x1A4, 0x1AC, 0x1B4, 0x1BC};
 STATIC CONST UINT16 ROMDATA MmioBaseLimitHiRegOffset[MMIO_REG_PAIR_NUM] = {0x180, 0x184, 0x188, 0x18C, 0x190, 0x194, 0x198, 0x19C, 0x1C0, 0x1C4, 0x1C8, 0x1CC};
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.h
index 2a5d7f6..98acf00 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MmioMap.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define MMIO_REG_PAIR_NUM     12
@@ -64,7 +62,6 @@
 #define CONF_MAP_RANGE_3      0xEC
 #define CONF_MAP_NUM          4
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// MMIO base low
@@ -111,7 +108,6 @@ typedef struct {
 } CONFIGURATION_MAP;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MsrTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MsrTables.c
index e268ef5..211c1fa 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MsrTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15MsrTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15MSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F15MsrRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PciTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PciTables.c
index 86fe1de..02d9e95 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PciTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PciTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15PCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.c
index c63d555..9a2ec6a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15POWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ F15PmPwrChkCopyPstate (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.h
index ece2f36..cc91776 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15PowerCheck.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -70,7 +67,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.c
index b1aa92b..630ad5a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.c
@@ -67,7 +67,6 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X15_CPUF15UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -82,7 +81,6 @@ extern OPTION_MULTISOCKET_CONFIGURATION    OptionMultiSocketConfiguration;
 #define HT_PHY_LINK_PHY_RECEIVER_PROCESS_DLL_CONTROL_SL1 0x530F
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -155,12 +153,10 @@ CONST STATIC HT_PHY_DLL_COMP_LOOKUP_TABLE ROMDATA HtPhyDllCompLookupTable[] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.h
index f7d6bb6..ad724f4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15Utilities.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -69,7 +66,6 @@ typedef struct {
 } SW_VOLT_TRANS_NB;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
index 2f8a905..5239723 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
@@ -55,17 +55,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ GetF15WheaInitData (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F15HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/cpuFamRegisters.h
index 861878b..330d6ad 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/cpuFamRegisters.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/cpuFamRegisters.h
@@ -56,7 +56,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.c
index 0c440ca..015dcad 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.c
@@ -66,22 +66,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_PRESERVEMAILBOX_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PreserveMailboxFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.h
index a4af7ad..e62c7bd 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/PreserveMailbox.h
@@ -47,7 +47,6 @@
 #define _PRESERVE_MAILBOX_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #define MAX_PRESERVE_REGISTER_ENTRIES 2      ///< There is room on the heap for up to this per node.
@@ -56,12 +55,10 @@
 typedef UINT32 (*MAILBOX_REGISTER_SAVE_ENTRY) [MAX_PRESERVE_REGISTER_ENTRIES];
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.c
index b585af3..0b72761 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUAPM_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -80,7 +77,6 @@ EnableApmOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE ApmFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.h
index 4aad695..1964cef 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuApm.h
@@ -46,19 +46,16 @@
 #define _CPU_APM_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (APM_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.c
index 6447a68..96690a2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ EnableC6OnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE C6FamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.h
index c6a6179..01e65d5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuC6State.h
@@ -46,19 +46,16 @@
 #define _CPU_C6_STATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (C6_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index c99c757..f2c2dec 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CacheFlushOnHaltFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCdit.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCdit.c
index 67ae390..65af6f7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCdit.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCdit.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUCDIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,12 +87,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuCditHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -104,7 +101,6 @@ AcpiCditHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -122,7 +118,6 @@ GetAcpiCditMain (
    );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCoreLeveling.c
index bee26ad..72100de 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CoreLevelingFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.c
index e792a8c..29a3cfe 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpbFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.h
index a39cbb4..ad24e97 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCpb.h
@@ -46,19 +46,16 @@
 #define _CPU_CPB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPB_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.c
index 945aee1..71f685b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUCRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_CRAT_CONFIGURATION OptionCratConfiguration;  // global user config record
@@ -76,12 +75,10 @@ extern CPU_FAMILY_SUPPORT_TABLE CratFamilyServiceTable;
 extern S_MAKE_CRAT_ENTRY MakeCratEntryTable[];
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -138,12 +135,10 @@ STATIC CRAT_HEADER  ROMDATA CratHeaderStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.h
index 2ca9459..b79e7b0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuCrat.h
@@ -45,12 +45,10 @@
 #define _CPU_CRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,7 +76,6 @@ typedef struct _S_MAKE_CRAT_ENTRY {
 } S_MAKE_CRAT_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c
index 2d62f83..5c80317 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuDmi.c
@@ -61,18 +61,15 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUDMI_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CHAR8 ROMDATA str_ProcManufacturer[] = "Advanced Micro Devices, Inc.";
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
@@ -112,7 +109,6 @@ ReleaseDmiBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatureLeveling.c
index bc09434..27ba72d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.c
index 1e9c266..53d535a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.c
@@ -54,22 +54,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 extern CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[];
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.h
index f666153..2c94a42 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuFeatures.h
@@ -141,17 +141,14 @@
 
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 #define CPU_FEAT_BEFORE_PM_INIT           (0x0000000000000001ull)
@@ -244,7 +241,6 @@ typedef struct {
 } CPU_FEATURE_TABLE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.c
index d772e53..f8f3b93 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUHTC_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -82,7 +79,6 @@ EnableHtcOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE           HtcFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.h
index 3203b8f..a17ee39 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHtc.h
@@ -46,19 +46,16 @@
 #define _CPU_HTC_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HTC_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.c
index 6786725..19de2cc 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUHWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE HwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.h
index 77a525d..d662052 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuHwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_HW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.c
index 196ac10..1cf61b2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ EnableIoCstateOnSocket (
   IN       AMD_CPU_EARLY_PARAMS *CpuEarlyParams
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE    IoCstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.h
index 998b6b8..42c861e 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuIoCstate.h
@@ -45,14 +45,12 @@
 #define _CPU_IO_CSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Defines for ACPI C-State Objects
@@ -75,7 +73,6 @@ AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 #define   CSD_COORD_TYPE_HW_ALL 0xFE
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /* AML code definition */
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuL3Features.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuL3Features.h
index 3c28bb6..e85cc65 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuL3Features.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuL3Features.h
@@ -47,21 +47,18 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (L3_FEATURE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_DISABLE_CACHE (0x00000000ul | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 #define AP_LATE_TASK_ENABLE_CACHE  (0x00010000ul | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 #define L3_SCRUBBER_CONTEXT_ARRAY_SIZE 4
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.c
index 154f913..96b9adb 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.c
@@ -63,18 +63,15 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPULOWPWRPSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -92,7 +89,6 @@ ProgramHtcPstateLimit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE LowPwrPstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.h
index 0ba0bb6..4433db8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuLowPwrPstate.h
@@ -46,19 +46,16 @@
 #define _CPU_LOW_PWR_PSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (LOW_PWR_PSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.c
index 24cb8f4..5a2e0fe 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUMSGBASEDC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ EnableMsgC1eOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE MsgBasedC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.h
index a5aac1e..c7e186f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuMsgBasedC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_MSG_BASED_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MSG_BASED_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.c
index f095f4e..08cc370 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUPSI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -82,7 +79,6 @@ EnablePsiOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE           PsiFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.h
index 905ed64..91c405b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPsi.h
@@ -46,19 +46,16 @@
 #define _CPU_PSI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSI_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.c
index bad1ef8..0b922f5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUPSTATEHPCMODE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -83,7 +80,6 @@ EnablePstateHpcModeOnAps (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE PstateHpcModeFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.h
index 52cb395..37e22ef 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateHpcMode.h
@@ -46,18 +46,15 @@
 #define _CPU_PSTATE_HPC_MODE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (PSTATE_HPC_MODE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateTables.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateTables.h
index b75ea3e..ce4487f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateTables.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuPstateTables.h
@@ -46,19 +46,16 @@
 #define _CPU_PSTATE_TABLES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSTATE_CPU_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// P-state structure for each state
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSlit.c
index 67eaca1..ad03863 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSlit.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSLIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,12 +87,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuSlitHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -104,7 +101,6 @@ AcpiSlitHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -132,7 +128,6 @@ ReleaseSlitBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSrat.c
index dcd3d71..5d0cc93 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSrat.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config record
@@ -74,7 +73,6 @@ extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config
 #define FOURGB 0x010000ul
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -110,7 +108,6 @@ STATIC CPU_SRAT_HEADER  ROMDATA CpuSratHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
@@ -142,7 +139,6 @@ STATIC
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.c
index 4bc2dde..decb1b5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSWC1E_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE SwC1eFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.h
index a7806a0..04ea50a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuSwC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_SW_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 // Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (SW_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuWhea.c
index 1275d8d..fa62864 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Feature/cpuWhea.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUWHEA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 extern OPTION_WHEA_CONFIGURATION OptionWheaConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ GetAcpiWheaMain (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c
index 95579cb..f2c65e0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_S3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -149,7 +146,6 @@ RestoreConditionalMsrDevice (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.h
index 126c4cf..153935a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.h
@@ -46,19 +46,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define RESTART_FROM_BEGINNING_LIST 0xFFFFFFFFul
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -316,7 +313,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Table.c
index 530931c..ba2ab30 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Table.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_TABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ SetRegistersFromTablesAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/TableHt.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/TableHt.c
index e1a39bc..e42150f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/TableHt.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/TableHt.c
@@ -68,22 +68,18 @@ RDATA_GROUP (G1_PEICC)
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cahalt.c
index bc80453..d55292d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cahalt.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 // typedef unsigned int   uintptr_t;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ ExecuteWbinvdInstruction (
 	);
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.c
index 3bb4271..2fd796d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.c
@@ -63,7 +63,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUAPICUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /* ApFlags bits */
@@ -76,7 +75,6 @@ RDATA_GROUP (G1_PEICC)
 #define XFER_ELEMENT_SIZE    sizeof (UINT32)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -86,7 +84,6 @@ typedef VOID F_CPU_AMD_NMI_HANDLER (
 typedef F_CPU_AMD_NMI_HANDLER *PF_CPU_AMD_NMI_HANDLER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -176,7 +173,6 @@ LocalApicInitializationAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.h
index f198c5b..e130d49 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuApicUtilities.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define APIC_CTRL_DWORD 0xF
@@ -115,7 +113,6 @@
 #define IDT_DESC_TYPE_INT32  0x0E
 #define IDT_DESC_TYPE_TRAP32 0x0F
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID (*PF_AP_TASK) (AMD_CONFIG_PARAMS *StdHeader);
@@ -189,7 +186,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 //                   These are   P U B L I C   functions, used by AGESA
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBist.c
index 51175aa..f759c1f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBist.c
@@ -59,7 +59,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBIST_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +69,6 @@ GetBistResults (
   );
 
  /*----------------------------------------------------------------------------------------
-  *                          E X P O R T E D    F U N C T I O N S
   *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBrandId.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBrandId.c
index 659a09d..9a20bb4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBrandId.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuBrandId.c
@@ -59,12 +59,10 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBRANDID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA strEngSample[] = "AMD Engineering Sample";
@@ -78,7 +76,6 @@ CONST AMD_CPU_BRAND ROMDATA Dflt_Str2 = {0, 0, 0, SOCKET_IGNORE, DR_NO_STRING, D
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -89,7 +86,6 @@ SetBrandIdRegistersAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.c
index 2230637..8eeab49 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -94,7 +91,6 @@ McaInitializationAtEarly (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.h
index c441063..f3bf481 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEarlyInit.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -111,7 +109,6 @@ typedef struct {
 #define MICROCODE_PATCH_2K_SIZE    2048
 #define MICROCODE_PATCH_4K_SIZE    4096
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -241,7 +238,6 @@ struct _CPU_CORE_LEVELING_FAMILY_SERVICES {             // See Forward Declarati
 
 #define PERFORM_EARLY_ANY_CONDITION 0xFFFFFFFFul // the related function always needs to be run
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEnvInit.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEnvInit.h
index 4348687..0946eb8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEnvInit.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEnvInit.h
@@ -46,22 +46,18 @@
 #define _CPU_ENV_INIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 // HobTransfer
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEventLog.c
index f73f50b..e4394a2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuEventLog.c
@@ -57,13 +57,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUEVENTLOG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define TOTAL_EVENT_LOG_BUFFERS  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +85,6 @@ typedef struct {
 } AGESA_STRUCT_BUFFER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c
index 17f6923..6ae07d3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c
@@ -59,12 +59,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUFAMILYTRANSLATION_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +110,6 @@ CONST CPU_SPECIFIC_SERVICES ROMDATA cpuNullServices =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -125,7 +122,6 @@ GetCpuServices (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpuSupportedFamiliesTable;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.h
index f7d3b86..71cc991 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.h
@@ -129,7 +129,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 #include "cpuPostInit.h"
@@ -143,12 +142,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (CPU_SPECIFIC_SERVICES);
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -896,7 +893,6 @@ typedef struct {
 } CPU_FAMILY_ID_XLAT_TABLE;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuGeneralServices.c
index db656b0..b0751f7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuGeneralServices.c
@@ -64,24 +64,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUGENERALSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTIONS_CONFIG_TOPOLOGY TopologyConfiguration;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 
@@ -185,7 +181,6 @@ AmdIdentifyCore (
 }
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - AGESA common General Services
  *----------------------------------------------------------------------------------------
  */
 
@@ -316,7 +311,6 @@ IdentifyCore (
 
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - cpu component General Services
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuInitEarlyTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuInitEarlyTable.c
index 9b502ba..3564db4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuInitEarlyTable.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -80,7 +77,6 @@ GetCommonEarlyInitOnCoreTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern F_PERFORM_EARLY_INIT_ON_CORE McaInitializationAtEarly;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.c
index 30c6a7e..a82625d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_CPULATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ DisableCf8ExtCfg (
   IN       AMD_CONFIG_PARAMS   *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.h
index 3e5137c..2b764b3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuLateInit.h
@@ -50,12 +50,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (PROC_FAMILY_TABLE);
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -348,7 +346,6 @@ CpuLateInitApTask (
 #define     PSTATE_FLAG_2           0xAA
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -1037,7 +1034,6 @@ typedef enum {
 } CRAT_ENTRY_TYPE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuMicrocodePatch.c
index 672e2cb..9b54068 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuMicrocodePatch.c
@@ -60,13 +60,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUMICROCODEPATCH_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -75,7 +73,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -86,7 +83,6 @@ LoadMicrocode (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.c
index c7b7e0f..453a60e 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.c
@@ -70,17 +70,14 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUPOSTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -90,7 +87,6 @@ SyncVariableMTRR (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.h
index db80c56..8825ee8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPostInit.h
@@ -47,20 +47,17 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPU_CFOH_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define P_STATE_DATA_GATHER_TEMP_ADDR     0x200000ul ///< Fixed the row data at 2M memory address.
 #define GLOBAL_CPU_FEATURE_LIST_TEMP_ADDR 0x200000ul ///< Fixed the row data at 2M memory address.
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -184,7 +181,6 @@ struct _CPU_CFOH_FAMILY_SERVICES {                     // See forward reference
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmt.c
index a5346b5..8988ea3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmt.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ GoToMemInitPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.c
index 7e23114..84f7d37 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTMULTISOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -85,7 +82,6 @@ GetNextEvent (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.h
index 6203604..0c0fa0a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtMultiSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.c
index 2503814..b89f23a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTSINGLESOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.h
index b7ec9d3..b3409d6 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSingleSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSystemTables.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSystemTables.h
index 0f151eb..a6b8f35 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSystemTables.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuPowerMgmtSystemTables.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define PM_EXEFLAGS_WARM_ONLY    0x00000001ul   /* Skip step if set && cold reset */
@@ -62,7 +60,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID F_PM_STEP_FUNCTION (
@@ -84,7 +81,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h
index 48fcb24..9bcffc0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h
@@ -57,7 +57,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
@@ -386,7 +385,6 @@ typedef struct {
 /*
  * --------------------------------------------------------------------------------------
  *
- *             D E F I N E S    /   T Y P E D E F S   /  S T R U C T U R E S
  *
  * --------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuServices.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuServices.h
index f51d41f..2a8abee 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuServices.h
@@ -46,12 +46,10 @@
 #define _CPU_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
  /// WARM RESET STATE_BITS
@@ -61,7 +59,6 @@
 #define WR_STATE_POST  03
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -134,7 +131,6 @@ typedef struct _WARM_RESET_REQUEST {
   UINT8             Reserved:(8 - 5);                   ///< Reserved
 } WARM_RESET_REQUEST;
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuWarmReset.c
index 60a9d69..c252c75 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuWarmReset.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUWARMRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -142,7 +138,6 @@ GetWarmResetFlag (
   }
 }
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.c
index 2e45471..707b19f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_HEAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
@@ -102,7 +99,6 @@ InsertFreeSpaceNode (
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.h
index 6295a65..2b0eedd 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.h
@@ -46,13 +46,11 @@
 #define _HEAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define AMD_MTRR_VARIABLE_BASE0 0x200
@@ -110,7 +108,6 @@
 #define AMD_MTRR_FIX4K_UC_DRAM   0x1818181818181818ull
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Allocate Heap Parameters
@@ -208,7 +205,6 @@ typedef enum {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.c
index 7e538f0..bb174e6 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.c
@@ -58,19 +58,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_MMIOMAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE MmioMapFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ extern CPU_FAMILY_SUPPORT_TABLE MmioMapFamilyServiceTable;
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.h
index 9b9ab3b..cf3881f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/mmioMapManager.h
@@ -46,19 +46,16 @@
 #define _MMIO_MAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MMIO_MAP_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// MMIO attribute
@@ -129,7 +126,6 @@ struct _MMIO_MAP_FAMILY_SERVICES {
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEarly.c
index 181b1fa..1ec94d3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEarly.c
@@ -65,13 +65,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitExeCacheMap[] =
@@ -82,7 +80,6 @@ EXECUTION_CACHE_REGION InitExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -97,7 +94,6 @@ AllocateExecutionCacheInitializer (
   IN       EXECUTION_CACHE_REGION *AmdExeAddrMapPtr
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEnv.c
index 8097e43..de6f06a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitEnv.c
@@ -64,25 +64,21 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitLate.c
index d907a33..a70d5b5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitLate.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDINITLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
@@ -72,13 +71,11 @@ extern OPTION_SLIT_CONFIGURATION   OptionSlitConfiguration; // global user confi
 extern OPTION_PSTATE_LATE_CONFIGURATION OptionPstateLateConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -88,7 +85,6 @@ AmdLatePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitMid.c
index 5807dc5..d67d0a2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitMid.c
@@ -63,25 +63,21 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitPost.c
index f1cee5e..e7bed28 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitPost.c
@@ -65,19 +65,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -88,7 +85,6 @@ AmdPostPlatformConfigInit (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitRecovery.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitRecovery.c
index ac4c08d..009cca4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitRecovery.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitRecovery.c
@@ -62,12 +62,10 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_COMMON_AMDINITRECOVERY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitReset.c
index 5cb2adc..96e9ffb 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitReset.c
@@ -66,19 +66,16 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST OPTION_HT_INIT_RESET HtOptionInitReset;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -87,7 +84,6 @@ AmdInitResetExecutionCacheAllocateInitializer (
   IN       EXECUTION_CACHE_REGION *AmdExeAddrMapPtr
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitResume.c
index 645cd69..3079a51 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdInitResume.c
@@ -66,25 +66,21 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITRESUME_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdLateRunApTask.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdLateRunApTask.c
index b11fca2..4bd7e5c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdLateRunApTask.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdLateRunApTask.c
@@ -57,25 +57,21 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDLATERUNAPTASK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE ApDispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3LateRestore.c
index fb8edd9..58cd56f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3LateRestore.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDS3LATERESTORE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -83,7 +80,6 @@ AmdS3LateRestorePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3Save.c
index f8cdcf1..5f1171c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/AmdS3Save.c
@@ -67,13 +67,11 @@ RDATA_GROUP (G3_DXE)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT32 ROMDATA S3LateHeapTable[] =
@@ -91,7 +89,6 @@ CONST UINT32 ROMDATA S3LateHeapTable[] =
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -101,7 +98,6 @@ AmdS3SavePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonInits.c
index 799018b..ff72538 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonInits.c
@@ -56,24 +56,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_COMMONINITS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonReturns.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonReturns.c
index 4563d6b..7a74c0c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonReturns.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/CommonReturns.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/CreateStruct.c
index f99bd66..aa3d63a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/CreateStruct.c
@@ -59,24 +59,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_CREATESTRUCT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST FUNCTION_PARAMS_INFO FuncParamsInfo[];
 extern CONST UINTN InitializerCount;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3RestoreState.c
index b8716f2..a24cdc2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3RestoreState.c
@@ -59,19 +59,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_S3RESTORESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 extern S3_SCRIPT_CONFIGURATION    OptionS3ScriptConfiguration;
 extern S3_DISPATCH_FUNCTION_ENTRY S3DispatchFunctionTable[];
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3SaveState.c
index eaebdb1..07f684f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Common/S3SaveState.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_S3SAVESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c
index 5a9899a..ee1db6c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/EnvDefHudson2.c
@@ -51,7 +51,6 @@
 #include  "FchPlatform.h"
 #include  "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c
index ba267c3..a309f06 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Interface/Family/Hudson2/ResetDefHudson2.c
@@ -51,7 +51,6 @@
 #include  "FchPlatform.h"
 #include  "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c
index 26ff51d..c7f12fe 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataEnvService.c
@@ -53,7 +53,6 @@
 #define FILECODE PROC_FCH_SATA_FAMILY_HUDSON2_HUDSON2SATAENVSERVICE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c
index 673cc15..1146133 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/Sata/Family/Hudson2/Hudson2SataService.c
@@ -53,7 +53,6 @@
 #define FILECODE PROC_FCH_SATA_FAMILY_HUDSON2_HUDSON2SATASERVICE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/GnbLibFeatures.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/GnbLibFeatures.c
index e7b833f..e06f8a0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/GnbLibFeatures.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Common/GnbLibFeatures.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define  FILECODE PROC_GNB_COMMON_GNBLIBFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEarly.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEarly.c
index 65e7b96..0e032f0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEarly.c
@@ -57,19 +57,16 @@
 #define FILECODE PROC_GNB_GNBINITATEARLY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEarlyFeatureTable[];
 extern  OPTION_GNB_CONFIGURATION  GnbEarlierFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEnv.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEnv.c
index 0bc3451..67f13af 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtEnv.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEnvFeatureTable[];
 extern  BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtLate.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtLate.c
index a73bb08..6343f81 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtLate.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtLate.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern  OPTION_GNB_CONFIGURATION  GnbLateFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtMid.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtMid.c
index 221fa8d..3e49871 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtMid.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtMid.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbMidFeatureTable[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtPost.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtPost.c
index 31acf49..5648303 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtPost.c
@@ -55,7 +55,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbPostFeatureTable[];
@@ -63,13 +62,11 @@ extern  OPTION_GNB_CONFIGURATION  GnbPostAfterDramFeatureTable[];
 extern  BUILD_OPT_CFG             UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtReset.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtReset.c
index 75122af..5ea034b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtReset.c
@@ -51,19 +51,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtS3Save.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtS3Save.c
index e1e03f3..2b78d6a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtS3Save.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/GnbInitAtS3Save.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATS3SAVE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern  OPTION_GNB_CONFIGURATION  GnbS3SaveFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
index 7f701f0..6f900bd 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
@@ -60,20 +60,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_SERVICE  *ServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
index db203fa..c5b9f70 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBCPUACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
index b8cca2b..d091083 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
@@ -56,13 +56,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBHEAP_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
index 79e2656..e1793e1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
@@ -55,19 +55,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBIOACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
index 8e679bf..29c931e 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBMEMACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
index e8467d3..9410cfa 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBPCIACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
index c9713f5..2d2ac59 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
@@ -58,18 +58,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBFAMTRANSLATION_GNBPCIETRANSLATION_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
index 8097e64..ae90f13 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
@@ -57,18 +57,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBFAMTRANSLATION_GNBTRANSLATION_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
index 02386ff..087eed9 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,13 +66,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
index b822294..1fbdae6 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,13 +66,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
index a641902..6cae630 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
index 49fd4cb..90269e0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,13 +66,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
index 8946d01..b99210d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
@@ -57,13 +57,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXCARDINFO_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +74,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
index f3af5e9..73be5d0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
@@ -62,14 +62,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXENUMCONNECTORS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -99,7 +97,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
index 1bbb397..1670c7f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c
@@ -64,12 +64,10 @@
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXPOWERPLAYTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 /// Software state
@@ -106,7 +104,6 @@ typedef struct {
   ATOM_PPLIB_VCE_STATE_RECORD               VceStateArray[MAX_NUM_OF_VCE_STATES];         ///< VCE state array
 } PP_WORKSPACE;
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
index 2436890..75932c6 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
@@ -60,21 +60,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GNBGFXINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxEnvInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxEnvInitTN.c
index f6f9d29..af2f493 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxEnvInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxEnvInitTN.c
@@ -68,7 +68,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GFXENVINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,13 +75,11 @@ extern GNB_TABLE ROMDATA      GfxEnvInitTableTN[];
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxGmcInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxGmcInitTN.c
index 3e151c1..ac24239 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxGmcInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxGmcInitTN.c
@@ -61,7 +61,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GFXGMCINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +73,6 @@ extern GNB_TABLE ROMDATA GfxGmcColockGatingEnableTN [];
 #define GNB_GFX_DRAM_CH_1_PRESENT 2
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -202,7 +200,6 @@ DCT_REGISTER_ENTRY DctRegisterTable [] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c
index 29b3d67..4364287 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c
@@ -70,7 +70,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GFXINTEGRATEDINFOTABLETN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +77,11 @@
 #define GFX_REFCLK                        100     // (in MHz) Reference clock is 100 MHz
 #define GFX_NCLK_MIN                      700     // (in MHz) Minimum value for NCLK is 700 MHz
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c
index ce50a97..0b9fdef 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c
@@ -60,14 +60,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GFXLIBTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT16 GfxMemClockFrequencyDefinitionTable [][8] = {
@@ -78,7 +76,6 @@ CONST UINT16 GfxMemClockFrequencyDefinitionTable [][8] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxMidInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxMidInitTN.c
index 7e3e659..c993c89 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxMidInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxMidInitTN.c
@@ -68,19 +68,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GFXMIDINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxPostInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxPostInitTN.c
index efcd02f..7fc2609 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxPostInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxPostInitTN.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GFXPOSTINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxTablesTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxTablesTN.c
index d8e7b13..ad04672 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxTablesTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxTablesTN.c
@@ -56,19 +56,16 @@
 #include  "GnbInitTN.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbBapmCoeffCalcTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbBapmCoeffCalcTN.c
index e556ece..34b313a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbBapmCoeffCalcTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbBapmCoeffCalcTN.c
@@ -57,7 +57,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBBAPMCOEFFCALC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -66,12 +65,10 @@
 #define GnbFpLibGetMnts(V) (INT64) ((*((UINT64*) &Value) & ((1ull << 52) - 1)) | (1ull << 52))
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEarlyInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEarlyInitTN.c
index c700a64..ef035dd 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEarlyInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEarlyInitTN.c
@@ -67,7 +67,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBEARLYINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +77,11 @@ extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 extern BUILD_OPT_CFG          UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEnvInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEnvInitTN.c
index 8e6d6ef..380403f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEnvInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbEnvInitTN.c
@@ -64,20 +64,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBENVINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 extern GNB_TABLE ROMDATA      GnbEnvInitTableTN [];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbFuseTableTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbFuseTableTN.c
index 9737bd2..cbcc329 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbFuseTableTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbFuseTableTN.c
@@ -63,21 +63,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBFUSETABLETN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbIommuIvrsTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbIommuIvrsTN.c
index d4519b7..f6e54cd 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbIommuIvrsTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbIommuIvrsTN.c
@@ -63,19 +63,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBIOMMUIVRSTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbMidInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbMidInitTN.c
index 1f80537..298f7ce 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbMidInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbMidInitTN.c
@@ -71,7 +71,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBMIDINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,13 +78,11 @@ extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 extern GNB_TABLE ROMDATA      GnbMidInitTableTN[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 #define NUM_DPM_STATES 8
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbPostInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbPostInitTN.c
index 4cac1cb..d34bdb7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbPostInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbPostInitTN.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBPOSTINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbRegisterAccTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbRegisterAccTN.c
index f8e885c..b228b2d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbRegisterAccTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbRegisterAccTN.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_GNBREGISTERACCTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define GNB_IGNORED_PARAM             0xFF
@@ -69,13 +68,11 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbTablesTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbTablesTN.c
index 6b855ae..87f6b26 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbTablesTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbTablesTN.c
@@ -55,19 +55,16 @@
 #include  "GnbInitTN.h"
 #include  "cpuFamRegisters.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,7 +76,6 @@
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 GNB_TABLE ROMDATA GnbEarlierInitTableBeforeSmuTN [] = {
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFM2.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFM2.c
index fcd6fa1..4920ee8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFM2.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFM2.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEALIBTNFM2_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID *
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFS1.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFS1.c
index bce0613..34e2451 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFS1.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibTNFS1.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEALIBTNFS1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID *
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieComplexDataTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieComplexDataTN.c
index 60ea236..17eadc8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieComplexDataTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieComplexDataTN.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIECOMPLEXDATATN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieConfigTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieConfigTN.c
index da962d5..2ee1d2c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieConfigTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieConfigTN.c
@@ -62,20 +62,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIECONFIGTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern TN_COMPLEX_CONFIG      ComplexDataTN;
 extern PCIe_PORT_DESCRIPTOR   DefaultSbPort;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEarlyInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEarlyInitTN.c
index 767268e..c696d1c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEarlyInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEarlyInitTN.c
@@ -69,7 +69,6 @@
 
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEEARLYINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,13 +78,11 @@ extern CONST PCIE_HOST_REGISTER_TABLE_HEADER ROMDATA PcieInitEarlyTableTN;
 extern CONST PCIE_PORT_REGISTER_TABLE_HEADER ROMDATA PortInitEarlyTableTN;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEnvInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEnvInitTN.c
index 995f3c0..51bec06 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEnvInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieEnvInitTN.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEENVINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieLibTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieLibTN.c
index 49fdff3..3445dd2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieLibTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieLibTN.c
@@ -67,19 +67,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIELIBTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 PCIE_LINK_SPEED_CAP
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieMidInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieMidInitTN.c
index 9be4a19..b72fd14 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieMidInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieMidInitTN.c
@@ -63,7 +63,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEMIDINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,13 +70,11 @@ extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 extern CONST PCIE_PORT_REGISTER_TABLE_HEADER ROMDATA PortInitMidTableTN;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePostInitTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePostInitTN.c
index 39c3cc8..a92bd21 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePostInitTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePostInitTN.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEPOSTINITTN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePowerGateTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePowerGateTN.c
index 50ea497..c36d1fc 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePowerGateTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PciePowerGateTN.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITTN_PCIEPOWERGATETN_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieTablesTN.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieTablesTN.c
index b1ac093..d48c7e7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieTablesTN.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieTablesTN.c
@@ -53,19 +53,16 @@
 #include  "GnbRegistersTN.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c
index b6b98e0..9a243c2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIommuIvrs/GnbIommuIvrs.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBIOMMUIVRS_GNBIOMMUIVRS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 #define IVRS_TABLE_LENGTH 8 * 1024
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c
index 807a78e..2721144 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbIvrsLib/GnbIvrsLib.c
@@ -64,17 +64,14 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBIVRSLIB_GNBIVRSLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbMSocketLib/GnbMSocketLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbMSocketLib/GnbMSocketLib.c
index dde61b5..b0e0066 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbMSocketLib/GnbMSocketLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbMSocketLib/GnbMSocketLib.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBMSOCKETLIB_GNBMSOCKETLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
index 9080571..45469b2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV1/GnbNbInitLibV1.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV1_GNBNBINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
index 84a02d1..db867a1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
@@ -62,14 +62,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV4_GNBNBINITLIBV4_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define SMC_RAM_START_ADDR 0x10000ul
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,7 +77,6 @@ typedef struct {
 } GNB_TOPOLOGY_INFO_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
index 13f1449..9c76490 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAlibV1/PcieAlib.c
@@ -69,7 +69,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEALIBV1_PCIEALIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +77,11 @@ extern  F_ALIB_UPDATE *AlibDispatchTable[];
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
index 6b8795c..ed75277 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
@@ -58,13 +58,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +73,6 @@ typedef struct {
 } PCIE_ASPM_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
index ebbe0d3..41f6573 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
@@ -56,18 +56,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECLKPM_PCIECLKPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
index 9d4b959..a5dac09 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
@@ -57,19 +57,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_GNBHANDLELIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
index 0719e52..88ed9b9 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
@@ -65,7 +65,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,7 +72,6 @@ extern BUILD_OPT_CFG UserOptions;
 extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +79,6 @@ extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 #define PcieConfigAttachParent(P, C) (C)->Parent = (UINT16) ((UINT8 *) C - (UINT8 *) P);
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
index 6466862..d41e2e8 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
index 9de483c..9a6500f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEINPUTPARSER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
index 26515e3..f80e788 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEMAPTOPOLOGY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
index a2aa396..886f7a1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
@@ -54,18 +54,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMBLACKLIST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
index e627a8b..35aee11 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmExitLatency.c
@@ -56,13 +56,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMEXITLATENCY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +72,6 @@ typedef struct {
 } PCIE_EXIT_LATENCY_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
index db56ca5..988d481 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePhyServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPHYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,7 +66,6 @@
 #define MAX_NUM_LANE_PER_PHY  8
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +76,11 @@ INT8  chtype_2 /* DeemPh35Gen2Nom */ [] = {    42,        64,       0,      42,
 INT8  chtype_3 /* Deemph60Gen2NOm */ [] = {    42,        64,       0,      42,      64,       77};
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
index 389e7bd..816aa87 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,18 +72,15 @@
 #define PIF_GANG_ALL   (0x1 << 25)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
index 5d534c3..41e6afe 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTREGACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
index 284ef80..57af1ba 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
index 2a40c09..c1a5345 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PciePowerMgmt.c
@@ -60,19 +60,16 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPOWERMGMT_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
index 92ec4c5..8acf31c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieSiliconServices.c
@@ -58,18 +58,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIESILICONSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
index 02e5c12..ac6cab3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETIMER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
index ddcbccb..df3d000 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETOPOLOGYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
index 4e3f284..7ea7725 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEUTILITYLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /// Lane type
@@ -79,7 +78,6 @@ typedef enum {
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -88,7 +86,6 @@ typedef struct {
 } PCIE_GLOBAL_GEN_CAP_WORKSPACE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieMaxPayloadV4.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieMaxPayloadV4.c
index 045315f..bb5b225 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieMaxPayloadV4.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieMaxPayloadV4.c
@@ -62,13 +62,11 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV4_PCIEMAXPAYLOADV4_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -78,7 +76,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
index bbc5b13..6f69a79 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV4_PCIEPORTSERVICESV4_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePowerMgmtV4.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePowerMgmtV4.c
index 931cf42..d1c265f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePowerMgmtV4.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PciePowerMgmtV4.c
@@ -61,19 +61,16 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV4_PCIEPOWERMGMTV4_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
index 37d8548..1487eda 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV4_PCIEWRAPPERSERVICESV4_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
index f8a35cc..c890ef7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieTraining.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIETRAINING_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
index 0232991..2db20a2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbPcieTrainingV1/PcieWorkarounds.c
@@ -59,14 +59,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV1_PCIEWORKAROUNDS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -111,7 +109,6 @@ PcieIsDeskewCardDetected (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
index 77fbe69..ffbbc08 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSSOCKETLIB_GNBSSOCKETLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c
index 7d541df..dfa7314 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbIommuLib/GnbSbIommuLib.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBIOMMULIB_GNBSBIOMMULIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
index 17305a4..3260f8b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
@@ -56,19 +56,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBLIB_GNBSBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
index a7f69f1..d179e20 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBLIB_GNBSBPCIE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSview/GnbSview.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSview/GnbSview.c
index b3fa40f..0711709 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSview/GnbSview.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbSview/GnbSview.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSVIEW_GNBSVIEW_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbTable/GnbTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbTable/GnbTable.c
index f8faa36..8f21cfd 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbTable/GnbTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbTable/GnbTable.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBTABLE_GNBTABLE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsIdtTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsIdtTable.c
index 4ecc791..41a5be1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsIdtTable.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsIdtTable.c
@@ -58,7 +58,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_IDS_DEBUG_IDSIDTTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
  IDS_STATUS
@@ -81,7 +80,6 @@ IdsUpdateExceptionVector (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern UINT64 IdsExceptionHandler;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h
index a30dc37..1da9696 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h
@@ -133,7 +133,6 @@ typedef struct _IDS_EARLY_AP_TASK {
 #define IDS_ALL_DCT   0xFF
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mu.c
index a4e5716..f4469ac 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/mu.c
@@ -62,17 +62,14 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +109,6 @@ AlignPointerTo16Byte (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/GeneralServices.h b/src/vendorcode/amd/agesa/f16kb/Include/GeneralServices.h
index d07db77..6a7e365 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/GeneralServices.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/GeneralServices.h
@@ -47,12 +47,10 @@
 #define _GENERAL_SERVICES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NUMBER_OF_EVENT_DATA_PARAMS 4
@@ -64,7 +62,6 @@
 #define AMD_DEV_VEN_ID_ADDRESS 0
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct {
 } AGESA_EVENT;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCdit.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionCdit.h
index 19afc75..7f4d162 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCdit.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionCdit.h
@@ -45,18 +45,15 @@
 #define _OPTION_CDIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct  {
 } OPTION_CDIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCrat.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionCrat.h
index db5588d..9be2350 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCrat.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionCrat.h
@@ -48,18 +48,15 @@
 #include "cpuCrat.h"
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -134,7 +131,6 @@ typedef struct _CRAT_FAMILY_SERVICES {
 } CRAT_FAMILY_SERVICES;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionDmi.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionDmi.h
index 9fbc889..9c4f3d1 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionDmi.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionDmi.h
@@ -45,18 +45,15 @@
 #define _OPTION_DMI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ typedef struct  {
 } OPTION_DMI_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hEarlySample.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hEarlySample.h
index 2c424c0..0932b01 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hEarlySample.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hEarlySample.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -67,7 +64,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecovery.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecovery.h
index 1d96113..ef6ab39 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecovery.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecovery.h
@@ -45,18 +45,15 @@
 #define _OPTION_GFX_RECOVERY_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,7 +70,6 @@ typedef struct  {
 } OPTION_GFX_RECOVERY_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionGnb.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionGnb.h
index a1b9166..c97b2d1 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionGnb.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionGnb.h
@@ -45,18 +45,15 @@
 #define _OPTION_GNB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -127,7 +124,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionMemory.h
index 23b5109..88e5fa0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionMemory.h
@@ -51,19 +51,16 @@
 #include "ma.h"
 #include "mp.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MAX_FF_TYPES      6   ///< Maximum number of DDR Form factors (UDIMMs, RDIMMMs, SODIMMS) supported
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -321,7 +318,6 @@ typedef struct _MEM_PSC_FLOW_BLOCK {
 } MEM_PSC_FLOW_BLOCK;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 /* Feature Default Return */
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocket.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocket.h
index c266aad..9ff4382 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocket.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocket.h
@@ -45,18 +45,15 @@
 #define _OPTION_MULTISOCKET_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -207,7 +204,6 @@ typedef struct  {
 } OPTION_MULTISOCKET_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionPstate.h
index 683af0a..864d315 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionPstate.h
@@ -47,17 +47,14 @@
 #include "cpuPstateTables.h"
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -110,7 +107,6 @@ typedef struct  {
 } OPTION_PSTATE_LATE_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionSlit.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionSlit.h
index 8ee229a..5df945d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionSlit.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionSlit.h
@@ -45,18 +45,15 @@
 #define _OPTION_SLIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -90,7 +87,6 @@ typedef struct  {
 } OPTION_SLIT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionSrat.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionSrat.h
index 4bce6a4..6a30788 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionSrat.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionSrat.h
@@ -45,18 +45,15 @@
 #define _OPTION_SRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +73,6 @@ typedef struct  {
 } OPTION_SRAT_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionWhea.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionWhea.h
index 7f5d0d8..9f14ce4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionWhea.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionWhea.h
@@ -45,18 +45,15 @@
 #define _OPTION_WHEA_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,7 +72,6 @@ typedef struct  {
 } OPTION_WHEA_CONFIGURATION;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f16kb/Include/OptionsHt.h
index 51f056d..6687462 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionsHt.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/OptionsHt.h
@@ -46,18 +46,15 @@
 #define _OPTION_HT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -102,7 +99,6 @@ typedef struct {
 } OPTION_HT_INIT_RESET;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/agesa/f16kb/Include/PlatformMemoryConfiguration.h
index 4ab6a0c..82b4c0c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/agesa/f16kb/Include/PlatformMemoryConfiguration.h
@@ -45,7 +45,6 @@
 #define _PLATFORM_MEMORY_CONFIGURATION_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #ifndef PSO_ENTRY
@@ -53,11 +52,9 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c
index 782a523..ea29d06 100644
--- a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c
@@ -56,7 +56,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LEGACY_PROC_DISPATCHER_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE DispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/agesaCallouts.c b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/agesaCallouts.c
index 990c0a7..7100818 100644
--- a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/agesaCallouts.c
+++ b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/agesaCallouts.c
@@ -61,27 +61,22 @@
 
 #define FILECODE LEGACY_PROC_AGESACALLOUTS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/hobTransfer.c b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/hobTransfer.c
index 7f03e13..e774a0f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/hobTransfer.c
+++ b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/hobTransfer.c
@@ -63,18 +63,15 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE LEGACY_PROC_HOBTRANSFER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
@@ -88,7 +85,6 @@ HeapGetBaseAddressInTempMem (
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Lib/amdlib.c b/src/vendorcode/amd/agesa/f16kb/Lib/amdlib.c
index 75354f9..19d1125 100644
--- a/src/vendorcode/amd/agesa/f16kb/Lib/amdlib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Lib/amdlib.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE LIB_AMDLIB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -108,7 +105,6 @@ ReadNumberOfCpuCores(
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbC6State.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbC6State.c
index b923fec..8b07c96 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbC6State.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbC6State.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -86,17 +85,14 @@ F16KbInitializeC6 (
   );
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCacheFlushOnHalt.c
index 95c3a5a..6e2067a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCacheFlushOnHalt.c
@@ -79,7 +79,6 @@ RDATA_GROUP (G3_DXE)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
index 5ed8b60..4be045d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBCOREAFTERRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -91,7 +88,6 @@ F16KbPmCoreAfterResetPhase2OnCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.h
index 2f98628..98ea35c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCpb.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCpb.c
index db00c58..6961807 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCpb.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCpb.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c
index 45b1b8f..6ed7006 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c
@@ -63,13 +63,11 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -99,7 +97,6 @@ CONST CPU_T4_PROC_FAMILY ROMDATA F16KbFT3T4ProcFamily[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -133,7 +130,6 @@ DmiF16KbGetExtClock (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbEquivalenceTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbEquivalenceTable.c
index 02e5df9..7b944cb 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbEquivalenceTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbEquivalenceTable.c
@@ -56,17 +56,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -78,7 +75,6 @@ GetF16KbMicrocodeEquivalenceTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA stu1[] =
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbHtc.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbHtc.c
index 9b93e45..fbf0baa 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbHtc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbHtc.c
@@ -69,7 +69,6 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -82,17 +81,14 @@ F16KbInitializeHtc (
   );
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
index be40248..0fe3d03 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
@@ -54,12 +54,10 @@ CODE_GROUP (G3_DXE)
 RDATA_GROUP (G3_DXE)
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -3531,11 +3529,9 @@ CONST UINT8 ROMDATA CpuF16KbId7001MicrocodePatch [IDS_PAD_4K] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
index 1e1b23d..021d732 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
@@ -59,18 +59,15 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST S_PERFORM_EARLY_INIT_ON_CORE ROMDATA F16KbEarlyInitBeforeApLaunchOnCoreTable[];
 extern CONST S_PERFORM_EARLY_INIT_ON_CORE ROMDATA F16KbEarlyInitAfterApLaunchOnCoreTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ F16KbLoadMicrocodePatchAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbIoCstate.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbIoCstate.c
index d3923d6..ea0fa5b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbIoCstate.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbIoCstate.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -82,13 +81,11 @@ F16KbIsCsdObjGenerated (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            IoCstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbLogicalIdTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbLogicalIdTables.c
index 97affa0..005c4ca 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbLogicalIdTables.c
@@ -54,17 +54,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -76,7 +73,6 @@ GetF16KbLogicalIdAndRev (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatchTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatchTables.c
index 4790709..576d9ac 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatchTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatchTables.c
@@ -57,19 +57,16 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 extern CONST MICROCODE_PATCHES_4K ROMDATA *CpuF16KbMicroCodePatchArray[];
 extern CONST UINT8 ROMDATA CpuF16KbNumberOfMicrocodePatches;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -81,7 +78,6 @@ GetF16KbMicroCodePatchesStruct (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMsrTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMsrTables.c
index 12dd300..96b9b04 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMsrTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMsrTables.c
@@ -58,17 +58,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBMSRTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -78,7 +75,6 @@ NbMcaLock (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.c
index 0ab9896..b5712a3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.c
@@ -69,17 +69,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBNBAFTERRESET_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -111,7 +108,6 @@ WaitForNbTransitionToComplete (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.h
index 0d2c7bc..1f30aac 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c
index 253d518..568fb10 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBPCITABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -90,7 +87,6 @@ SetTdpLimitDis (
   IN       AMD_CONFIG_PARAMS *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.c
index 2017f8b..619eba6 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBPOWERCHECK_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -100,7 +97,6 @@ F16KbTransitionPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.h
index 078a539..4e4d0ef 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerCheck.h
@@ -45,19 +45,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Power Check Error Data
@@ -71,7 +68,6 @@ typedef struct {
 } PWRCHK_ERROR_DATA;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerMgmtSystemTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerMgmtSystemTables.c
index fac2288..c60a53b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerMgmtSystemTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPowerMgmtSystemTables.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBPOWERMGMTSYSTEMTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -84,7 +81,6 @@ GetF16KbSysPmTable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPsi.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPsi.c
index 7d9d4d2..77ecddf 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPsi.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPsi.c
@@ -64,17 +64,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBPSI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,7 +85,6 @@ F16KbPmVrmLowPowerModeEnable (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPstate.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPstate.c
index 38913c1..cec9aa4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPstate.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPstate.c
@@ -67,17 +67,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -140,7 +137,6 @@ F16KbGetPstateRegisterInfo (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbSharedMsrTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbSharedMsrTable.c
index a953793..cd280a5 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbSharedMsrTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbSharedMsrTable.c
@@ -56,23 +56,19 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 //   M S R   T a b l e s
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c
index ed94e79..e405162 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -141,7 +138,6 @@ F16KbSetDownCoreRegister (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.h
index 4565cce..87f3505 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 #define FOUR_CORE_COMPUTE_UNIT_BITMAP    0xF
@@ -67,7 +64,6 @@
 #define ALL_CORES_DISABLE_BITMAP         0xFFFFFFFFul
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Apm.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Apm.c
index 2330f18..bbc773f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Apm.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Apm.c
@@ -63,22 +63,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_CPUF16APM_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16BrandId.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16BrandId.c
index 444315a..c571b00 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16BrandId.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16BrandId.c
@@ -60,14 +60,12 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define NAME_STRING_ADDRESS_PORT 0x194
 #define NAME_STRING_DATA_PORT 0x198
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// FAM16_BRAND_STRING_MSR
@@ -77,7 +75,6 @@ typedef struct _PROCESSOR_NAME_STRING {
 } PROCESSOR_NAME_STRING;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,12 +85,10 @@ F16SetBrandIdRegistersAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8 ROMDATA str_Unprogrammed_Sample[48] = "AMD Unprogrammed Engineering Sample";
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16CacheDefaults.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16CacheDefaults.c
index b89daaa..b455327 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16CacheDefaults.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16CacheDefaults.c
@@ -57,17 +57,14 @@ RDATA_GROUP (G2_PEI)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -79,7 +76,6 @@ GetF16CacheInfo (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define MEM_TRAINING_BUFFER_SIZE  16384
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.c
index df81dcd..1529420 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.c
@@ -62,23 +62,19 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.h
index c687c3b..048696e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Dmi.h
@@ -47,24 +47,20 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.c
index cf1d0d8..4d3fb74 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.c
@@ -61,24 +61,20 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_CPUF16MMIOMAP_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST UINT16 ROMDATA MmioBaseLowRegOffset[MMIO_REG_PAIR_NUM] = {0x80, 0x88, 0x90, 0x98, 0xA0, 0xA8, 0xB0, 0xB8, 0x1A0, 0x1A8, 0x1B0, 0x1B8};
 STATIC CONST UINT16 ROMDATA MmioLimitLowRegOffset[MMIO_REG_PAIR_NUM] = {0x84, 0x8C, 0x94, 0x9C, 0xA4, 0xAC, 0xB4, 0xBC, 0x1A4, 0x1AC, 0x1B4, 0x1BC};
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 #define F16_MMIO_ALIGN 0x10000l
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.h
index d202dfb..0f42cd3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MmioMap.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define MMIO_REG_PAIR_NUM     12
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// MMIO base low
@@ -83,7 +80,6 @@ typedef struct {
 } MMIO_LIMIT_LOW;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MsrUnknownTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MsrUnknownTables.c
index 5299228..b822e39 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MsrUnknownTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16MsrUnknownTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_CPUF16MSRUNKNOWNTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 STATIC CONST MSR_TYPE_ENTRY_INITIALIZER ROMDATA F16MsrUnknownRegisters[] =
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16PciUnknownTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16PciUnknownTables.c
index f4bd703..8f2dee3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16PciUnknownTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16PciUnknownTables.c
@@ -55,22 +55,18 @@ RDATA_GROUP (G3_DXE)
 #define FILECODE PROC_CPU_FAMILY_0X16_CPUF16PCIUNKNOWNTABLES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.c
index 8774824..43605e2 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.c
@@ -66,25 +66,21 @@ RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X16_CPUF16UTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern CPU_FAMILY_SUPPORT_TABLE            PstateFamilyServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.h
index e635fb0..6f404b0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16Utilities.h
@@ -47,19 +47,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// The structure for Software Initiated NB Voltage Transitions
@@ -69,7 +66,6 @@ typedef struct {
 } SW_VOLT_TRANS_NB;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c
index ab06fe1..69c2805 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c
@@ -55,17 +55,14 @@ RDATA_GROUP (G3_DXE)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -77,7 +74,6 @@ GetF16WheaInitData (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AMD_HEST_BANK_INIT_DATA F16HestBankInitData[] = {
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/cpuFamRegisters.h
index cfd0dae..5510099 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/cpuFamRegisters.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/cpuFamRegisters.h
@@ -56,7 +56,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/PreserveMailbox.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/PreserveMailbox.h
index 9417814..4affafb 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/PreserveMailbox.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/PreserveMailbox.h
@@ -47,7 +47,6 @@
 #define _PRESERVE_MAILBOX_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 #define MAX_PRESERVE_REGISTER_ENTRIES 2      ///< There is room on the heap for up to this per node.
@@ -56,12 +55,10 @@
 typedef UINT32 (*MAILBOX_REGISTER_SAVE_ENTRY) [MAX_PRESERVE_REGISTER_ENTRIES];
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.c
index d5b3bd7..9cf6393 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.c
@@ -59,17 +59,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUAPM_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -78,7 +75,6 @@ EnableApmOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE ApmFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.h
index ce418ec..2020694 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuApm.h
@@ -46,19 +46,16 @@
 #define _CPU_APM_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (APM_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.c
index 9a1d937..95bd0d7 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.c
@@ -65,17 +65,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUC6STATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ EnableC6OnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE C6FamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.h
index 1f77ca4..074c072 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuC6State.h
@@ -46,19 +46,16 @@
 #define _CPU_C6_STATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (C6_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCacheFlushOnHalt.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
index cf7d157..49d6e16 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCacheFlushOnHalt.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G2_PEI)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CacheFlushOnHaltFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCdit.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCdit.c
index e02e870..5a30889 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCdit.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCdit.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUCDIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,12 +87,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuCditHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -104,7 +101,6 @@ AcpiCditHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -122,7 +118,6 @@ GetAcpiCditMain (
    );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCoreLeveling.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCoreLeveling.c
index b00e979..57673ec 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCoreLeveling.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCoreLeveling.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CoreLevelingFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.c
index 0745452..1071a3e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUCPB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpbFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.h
index dd3e359..ee6b350 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCpb.h
@@ -46,19 +46,16 @@
 #define _CPU_CPB_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPB_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.c
index 552713d..61946dc 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUCRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_CRAT_CONFIGURATION OptionCratConfiguration;  // global user config record
@@ -76,12 +75,10 @@ extern CPU_FAMILY_SUPPORT_TABLE CratFamilyServiceTable;
 extern S_MAKE_CRAT_ENTRY MakeCratEntryTable[];
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -138,12 +135,10 @@ STATIC CRAT_HEADER  ROMDATA CratHeaderStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.h
index 6b2b9d6..074f765 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuCrat.h
@@ -45,12 +45,10 @@
 #define _CPU_CRAT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,7 +76,6 @@ typedef struct _S_MAKE_CRAT_ENTRY {
 } S_MAKE_CRAT_ENTRY;
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuDmi.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuDmi.c
index 6ff30d2..e7bbc4d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuDmi.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuDmi.c
@@ -61,18 +61,15 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUDMI_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CHAR8 ROMDATA str_ProcManufacturer[] = "Advanced Micro Devices, Inc.";
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT16
@@ -112,7 +109,6 @@ ReleaseDmiBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatureLeveling.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatureLeveling.c
index 6494c69..8c56388 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatureLeveling.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatureLeveling.c
@@ -77,7 +77,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.c
index d3753cb..6ebed7d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.c
@@ -56,22 +56,18 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 extern CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[];
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.h
index 47444ef..1872aa2 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuFeatures.h
@@ -141,17 +141,14 @@
 
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 #define CPU_FEAT_BEFORE_PM_INIT           (0x0000000000000001ull)
@@ -249,7 +246,6 @@ typedef struct {
 } CPU_FEATURE_TABLE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.c
index 9807102..29d0b29 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUHTC_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -82,7 +79,6 @@ EnableHtcOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE           HtcFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.h
index 913802f..d6360b9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuHtc.h
@@ -46,19 +46,16 @@
 #define _CPU_HTC_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (HTC_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.c
index a98f182..8ebdcc5 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.c
@@ -61,17 +61,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUIOCSTATE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -83,7 +80,6 @@ EnableIoCstateOnSocket (
   IN       AMD_CPU_EARLY_PARAMS *CpuEarlyParams
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE    IoCstateFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.h
index 5cd9c82..a1d1e54 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuIoCstate.h
@@ -45,14 +45,12 @@
 #define _CPU_IO_CSTATE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 // Defines for ACPI C-State Objects
@@ -75,7 +73,6 @@ AGESA_FORWARD_DECLARATION (IO_CSTATE_FAMILY_SERVICES);
 #define   CSD_COORD_TYPE_HW_ALL 0xFE
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /* AML code definition */
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuL3Features.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuL3Features.h
index aad05ce..b012584 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuL3Features.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuL3Features.h
@@ -47,21 +47,18 @@
 
 #include "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (L3_FEATURE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_DISABLE_CACHE (0x00000000ul | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 #define AP_LATE_TASK_ENABLE_CACHE  (0x00010000ul | PROC_CPU_FEATURE_CPUL3FEATURES_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 #define L3_SCRUBBER_CONTEXT_ARRAY_SIZE 4
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuMsgBasedC1e.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuMsgBasedC1e.h
index 0fc252f..0546639 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuMsgBasedC1e.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuMsgBasedC1e.h
@@ -46,19 +46,16 @@
 #define _CPU_MSG_BASED_C1E_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MSG_BASED_C1E_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPrefetchMode.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPrefetchMode.h
index 1d837f5..98f3df6 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPrefetchMode.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPrefetchMode.h
@@ -46,20 +46,17 @@
 #define _CPU_PREFETCH_MODE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PREFETCH_MODE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define AP_LATE_TASK_CPU_PREFETCH_MODE (PROC_CPU_FEATURE_CPUPREFETCHMODE_FILECODE)
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.c
index 8977236..50ddc31 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_FEATURE_CPUPSI_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
@@ -82,7 +79,6 @@ EnablePsiOnSocket (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE           PsiFamilyServiceTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.h
index ad2a5e5..53cf75a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPsi.h
@@ -46,19 +46,16 @@
 #define _CPU_PSI_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSI_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateHpcMode.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateHpcMode.h
index f8f41bf..dd27fa6 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateHpcMode.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateHpcMode.h
@@ -46,18 +46,15 @@
 #define _CPU_PSTATE_HPC_MODE_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (PSTATE_HPC_MODE_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateTables.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateTables.h
index 9ccacb4..b744e07 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateTables.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuPstateTables.h
@@ -46,19 +46,16 @@
 #define _CPU_PSTATE_TABLES_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (PSTATE_CPU_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 /// P-state structure for each state
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSlit.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSlit.c
index cbabf67..d2315f9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSlit.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSlit.c
@@ -68,7 +68,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSLIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -88,12 +87,10 @@ STATIC ACPI_TABLE_HEADER  ROMDATA CpuSlitHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -104,7 +101,6 @@ AcpiSlitHBufferFind (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     E X P O R T E D     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -132,7 +128,6 @@ ReleaseSlitBuffer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSrat.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSrat.c
index 9d6ca3d..aa71216 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSrat.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuSrat.c
@@ -65,7 +65,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUSRAT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config record
@@ -74,7 +73,6 @@ extern OPTION_SRAT_CONFIGURATION OptionSratConfiguration;  // global user config
 #define FOURGB 0x010000ul
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -110,7 +108,6 @@ STATIC CPU_SRAT_HEADER  ROMDATA CpuSratHdrStruct =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT8
@@ -142,7 +139,6 @@ STATIC
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuTdpLimiting.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuTdpLimiting.h
index 91ccd33..2bf6ba4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuTdpLimiting.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuTdpLimiting.h
@@ -46,19 +46,16 @@
 #define _CPU_TDP_LIMITING_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (TDP_LIMIT_FAMILY_SERVICES);
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                    T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuWhea.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuWhea.c
index f41dca9..9aaae0c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuWhea.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/cpuWhea.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_FEATURE_CPUWHEA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 extern OPTION_WHEA_CONFIGURATION OptionWheaConfiguration;  // global user config record
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ GetAcpiWheaMain (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*---------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c
index 7feb3fa..9f303fc 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_S3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -149,7 +146,6 @@ RestoreConditionalMsrDevice (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.h
index 6f776d0..d1e3606 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.h
@@ -46,19 +46,16 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define RESTART_FROM_BEGINNING_LIST 0xFFFFFFFFul
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -321,7 +318,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Table.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Table.c
index a27140b..f293f0f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Table.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Table.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_TABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -94,7 +91,6 @@ SetRegistersFromTablesAfterApLaunch (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cahalt.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cahalt.c
index bc80453..d55292d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cahalt.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cahalt.c
@@ -58,19 +58,16 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 // typedef unsigned int   uintptr_t;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -97,7 +94,6 @@ ExecuteWbinvdInstruction (
 	);
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.c
index ac824f3..6213a7a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.c
@@ -63,7 +63,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUAPICUTILITIES_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /* ApFlags bits */
@@ -76,7 +75,6 @@ RDATA_GROUP (G1_PEICC)
 #define XFER_ELEMENT_SIZE    sizeof (UINT32)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -86,7 +84,6 @@ typedef VOID F_CPU_AMD_NMI_HANDLER (
 typedef F_CPU_AMD_NMI_HANDLER *PF_CPU_AMD_NMI_HANDLER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -176,7 +173,6 @@ LocalApicInitializationAtEarly (
   IN       AMD_CONFIG_PARAMS      *StdHeader
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.h
index ee1a564..70af7a3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuApicUtilities.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define APIC_CTRL_DWORD 0xF
@@ -115,7 +113,6 @@
 #define IDT_DESC_TYPE_INT32  0x0E
 #define IDT_DESC_TYPE_TRAP32 0x0F
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID (*PF_AP_TASK) (AMD_CONFIG_PARAMS *StdHeader);
@@ -189,7 +186,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 //                   These are   P U B L I C   functions, used by AGESA
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuBist.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuBist.c
index 14dcd05..2c68971 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuBist.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuBist.c
@@ -59,7 +59,6 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUBIST_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +69,6 @@ GetBistResults (
   );
 
  /*----------------------------------------------------------------------------------------
-  *                          E X P O R T E D    F U N C T I O N S
   *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.c
index 832fa7e..d00a96f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.c
@@ -66,17 +66,14 @@ RDATA_GROUP (G1_PEICC)
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -107,7 +104,6 @@ EarlyTableAfterApLaunch (
   IN OUT   AMD_CPU_EARLY_PARAMS   *CpuEarlyParams
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.h
index ddbb571..0b3bf5e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEarlyInit.h
@@ -47,13 +47,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 AGESA_FORWARD_DECLARATION (CPU_CORE_LEVELING_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -111,7 +109,6 @@ typedef struct {
 #define MICROCODE_PATCH_2K_SIZE    2048
 #define MICROCODE_PATCH_4K_SIZE    4096
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -232,7 +229,6 @@ struct _CPU_CORE_LEVELING_FAMILY_SERVICES {             // See Forward Declarati
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEnvInit.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEnvInit.h
index 9b7b234..3ce909d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEnvInit.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEnvInit.h
@@ -46,22 +46,18 @@
 #define _CPU_ENV_INIT_H_
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 // HobTransfer
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEventLog.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEventLog.c
index 4b6a9f9..53e6036 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEventLog.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuEventLog.c
@@ -57,13 +57,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUEVENTLOG_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define TOTAL_EVENT_LOG_BUFFERS  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -87,7 +85,6 @@ typedef struct {
 } AGESA_STRUCT_BUFFER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.c
index 54eceec..46646ec 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.c
@@ -59,12 +59,10 @@ RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUFAMILYTRANSLATION_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -114,7 +112,6 @@ CONST CPU_SPECIFIC_SERVICES ROMDATA cpuNullServices =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -127,7 +124,6 @@ GetCpuServices (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CPU_FAMILY_SUPPORT_TABLE CpuSupportedFamiliesTable;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.h
index 309fc18..de74390 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuFamilyTranslation.h
@@ -129,7 +129,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 #include "cpuPostInit.h"
@@ -143,12 +142,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (CPU_SPECIFIC_SERVICES);
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
@@ -941,7 +938,6 @@ typedef struct {
 } CPU_FAMILY_ID_XLAT_TABLE;
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuGeneralServices.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuGeneralServices.c
index 0b3c991..7ec2c7a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuGeneralServices.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuGeneralServices.c
@@ -64,24 +64,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUGENERALSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTIONS_CONFIG_TOPOLOGY TopologyConfiguration;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - External General Services API
  *----------------------------------------------------------------------------------------
  */
 
@@ -185,7 +181,6 @@ AmdIdentifyCore (
 }
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - AGESA common General Services
  *----------------------------------------------------------------------------------------
  */
 
@@ -316,7 +311,6 @@ IdentifyCore (
 
 
 /*----------------------------------------------------------------------------------------
- *            E X P O R T E D    F U N C T I O N S - cpu component General Services
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.c
index 9e0451d..7000a6e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.c
@@ -60,17 +60,14 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_CPU_CPULATEINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -79,7 +76,6 @@ DisableCf8ExtCfg (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.h
index b27ed00..7a2b72e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuLateInit.h
@@ -50,12 +50,10 @@
 //  Forward declaration needed for multi-structure mutual references.
 AGESA_FORWARD_DECLARATION (PROC_FAMILY_TABLE);
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -342,7 +340,6 @@ AGESA_FORWARD_DECLARATION (PROC_FAMILY_TABLE);
 #define     PSTATE_FLAG_2           0xAA
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -1041,7 +1038,6 @@ typedef enum {
 } CRAT_ENTRY_TYPE;
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuMicrocodePatch.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuMicrocodePatch.c
index b3db886..62404ad 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuMicrocodePatch.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuMicrocodePatch.c
@@ -60,13 +60,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUMICROCODEPATCH_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 typedef union {
@@ -75,7 +73,6 @@ typedef union {
 } PATCH_LOADER;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
@@ -86,7 +83,6 @@ LoadMicrocode (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.c
index 605e0c4..c32bae0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.c
@@ -70,17 +70,14 @@ CODE_GROUP (G1_PEICC)
 RDATA_GROUP (G1_PEICC)
 #define FILECODE PROC_CPU_CPUPOSTINIT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -90,7 +87,6 @@ SyncVariableMTRR (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.h
index 2d192fe..dfbd76b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPostInit.h
@@ -47,20 +47,17 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (CPU_CFOH_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define P_STATE_DATA_GATHER_TEMP_ADDR     0x200000ul ///< Fixed the row data at 2M memory address.
 #define GLOBAL_CPU_FEATURE_LIST_TEMP_ADDR 0x200000ul ///< Fixed the row data at 2M memory address.
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 //----------------------------------------------------------------------------
@@ -184,7 +181,6 @@ struct _CPU_CFOH_FAMILY_SERVICES {                     // See forward reference
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmt.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmt.c
index 303e8d7..c377787 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmt.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmt.c
@@ -62,17 +62,14 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -98,7 +95,6 @@ GoToMemInitPstateCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.c
index 4009972..7cdb78e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.c
@@ -61,22 +61,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUPOWERMGMTSINGLESOCKET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.h
index 0a3024c..752cafe 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSingleSocket.h
@@ -47,25 +47,21 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSystemTables.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSystemTables.h
index 64baf46..cca76ad 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSystemTables.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuPowerMgmtSystemTables.h
@@ -45,13 +45,11 @@
 
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define PM_EXEFLAGS_WARM_ONLY    0x00000001ul   /* Skip step if set && cold reset */
@@ -62,7 +60,6 @@
 
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 typedef VOID F_PM_STEP_FUNCTION (
@@ -84,7 +81,6 @@ typedef struct {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuRegisters.h
index e59bb88..32c9eda 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuRegisters.h
@@ -57,7 +57,6 @@
 /*
  *--------------------------------------------------------------
  *
- *                      D E F I N I T I O N S  /  M A C R O S
  *
  *---------------------------------------------------------------
  */
@@ -466,7 +465,6 @@ typedef struct {
 /*
  * --------------------------------------------------------------------------------------
  *
- *             D E F I N E S    /   T Y P E D E F S   /  S T R U C T U R E S
  *
  * --------------------------------------------------------------------------------------
  */
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuServices.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuServices.h
index 7e68e3f..ff9b88d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuServices.h
@@ -48,12 +48,10 @@
 #include "Topology.h"
 
 /*----------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *----------------------------------------------------------------------------------------
  */
  /// WARM RESET STATE_BITS
@@ -63,7 +61,6 @@
 #define WR_STATE_POST  03
 
 /*----------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *----------------------------------------------------------------------------------------
  */
 
@@ -144,7 +141,6 @@ typedef struct _WARM_RESET_REQUEST {
   UINT8             Reserved:(8 - 5);                   ///< Reserved
 } WARM_RESET_REQUEST;
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuWarmReset.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuWarmReset.c
index 6aa5a76..acdf4ca 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuWarmReset.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuWarmReset.c
@@ -57,22 +57,18 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_CPUWARMRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -142,7 +138,6 @@ GetWarmResetFlag (
   }
 }
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S - (AGESA ONLY)
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.c
index 42a6afa..68665fd 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_CPU_HEAPMANAGER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
@@ -102,7 +99,6 @@ InsertFreeSpaceNode (
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT64
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.h
index a57c0d2..b3e83de 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/heapManager.h
@@ -46,13 +46,11 @@
 #define _HEAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 #define AMD_MTRR_VARIABLE_BASE0 0x200
@@ -110,7 +108,6 @@
 #define AMD_MTRR_FIX4K_UC_DRAM   0x1818181818181818ull
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// Allocate Heap Parameters
@@ -219,7 +216,6 @@ typedef enum {
 
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/mmioMapManager.h b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/mmioMapManager.h
index 542faa6..9fbce03 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/mmioMapManager.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/mmioMapManager.h
@@ -46,19 +46,16 @@
 #define _MMIO_MAP_MANAGER_H_
 
 /*---------------------------------------------------------------------------------------
- *          M I X E D   (Definitions And Macros / Typedefs, Structures, Enums)
  *---------------------------------------------------------------------------------------
  */
 //  Forward declaration needed for multi-structure mutual references
 AGESA_FORWARD_DECLARATION (MMIO_MAP_FAMILY_SERVICES);
 
 /*---------------------------------------------------------------------------------------
- *                 D E F I N I T I O N S     A N D     M A C R O S
  *---------------------------------------------------------------------------------------
  */
 
 /*---------------------------------------------------------------------------------------
- *               T Y P E D E F S,   S T R U C T U R E S,    E N U M S
  *---------------------------------------------------------------------------------------
  */
 /// MMIO attribute
@@ -130,7 +127,6 @@ struct _MMIO_MAP_FAMILY_SERVICES {
 };
 
 /*---------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *---------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEarly.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEarly.c
index ebefda7..7abb906 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEarly.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEarly.c
@@ -65,13 +65,11 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITEARLY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 EXECUTION_CACHE_REGION InitExeCacheMap[] =
@@ -82,7 +80,6 @@ EXECUTION_CACHE_REGION InitExeCacheMap[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -97,7 +94,6 @@ AllocateExecutionCacheInitializer (
   IN       EXECUTION_CACHE_REGION *AmdExeAddrMapPtr
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEnv.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEnv.c
index 83de69b..35d856e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEnv.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitEnv.c
@@ -64,25 +64,21 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitLate.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitLate.c
index 92aeb47..3aa7606 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitLate.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitLate.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDINITLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern OPTION_DMI_CONFIGURATION    OptionDmiConfiguration;  // global user config record
@@ -72,13 +71,11 @@ extern OPTION_SLIT_CONFIGURATION   OptionSlitConfiguration; // global user confi
 extern OPTION_PSTATE_LATE_CONFIGURATION OptionPstateLateConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -88,7 +85,6 @@ AmdLatePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitMid.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitMid.c
index 2bd4034..b49ae31 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitMid.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitMid.c
@@ -63,25 +63,21 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitPost.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitPost.c
index 842b159..6409860 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitPost.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitPost.c
@@ -65,19 +65,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -88,7 +85,6 @@ AmdPostPlatformConfigInit (
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitReset.c
index 30e194e..3de98a8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitReset.c
@@ -66,19 +66,16 @@ RDATA_GROUP (G1_PEICC)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST OPTION_HT_INIT_RESET HtOptionInitReset;
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -87,7 +84,6 @@ AmdInitResetExecutionCacheAllocateInitializer (
   IN       EXECUTION_CACHE_REGION *AmdExeAddrMapPtr
   );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitResume.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitResume.c
index 77dfdfc..f742a88 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitResume.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdInitResume.c
@@ -66,25 +66,21 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_AMDINITRESUME_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdLateRunApTask.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdLateRunApTask.c
index b7e125e..0f75e48 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdLateRunApTask.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdLateRunApTask.c
@@ -57,25 +57,21 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_AMDLATERUNAPTASK_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern CONST DISPATCH_TABLE ApDispatchTable[];
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3LateRestore.c
index 5b30e55..1683353 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3LateRestore.c
@@ -61,19 +61,16 @@ RDATA_GROUP (G2_PEI)
 
 #define FILECODE PROC_COMMON_AMDS3LATERESTORE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -83,7 +80,6 @@ AmdS3LateRestorePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3Save.c
index 7c5964c..6e616e1 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/AmdS3Save.c
@@ -67,13 +67,11 @@ RDATA_GROUP (G3_DXE)
 extern BLDOPT_FCH_FUNCTION  BldoptFchFunction;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT32 ROMDATA S3LateHeapTable[] =
@@ -91,7 +89,6 @@ CONST UINT32 ROMDATA S3LateHeapTable[] =
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -101,7 +98,6 @@ AmdS3SavePlatformConfigInit (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonInits.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonInits.c
index 8947137..add17da 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonInits.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonInits.c
@@ -56,24 +56,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_COMMONINITS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonReturns.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonReturns.c
index ec1dadf..c2f88bf 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonReturns.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/CommonReturns.c
@@ -64,7 +64,6 @@ RDATA_GROUP (G1_PEICC)
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/CreateStruct.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/CreateStruct.c
index 8468d3b..fabfa85 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/CreateStruct.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/CreateStruct.c
@@ -59,24 +59,20 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_CREATESTRUCT_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern CONST FUNCTION_PARAMS_INFO FuncParamsInfo[];
 extern CONST UINTN InitializerCount;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3RestoreState.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3RestoreState.c
index 9da575c..0b62877 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3RestoreState.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3RestoreState.c
@@ -59,19 +59,16 @@ RDATA_GROUP (G1_PEICC)
 
 #define FILECODE PROC_COMMON_S3RESTORESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 extern S3_SCRIPT_CONFIGURATION    OptionS3ScriptConfiguration;
 extern S3_DISPATCH_FUNCTION_ENTRY S3DispatchFunctionTable[];
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3SaveState.c b/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3SaveState.c
index c81c877..02402c4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3SaveState.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/S3SaveState.c
@@ -60,19 +60,16 @@ RDATA_GROUP (G3_DXE)
 
 #define FILECODE PROC_COMMON_S3SAVESTATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 extern S3_SCRIPT_CONFIGURATION OptionS3ScriptConfiguration;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/EnvDefYangtze.c b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/EnvDefYangtze.c
index f638e71..3ee8a05 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/EnvDefYangtze.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/EnvDefYangtze.c
@@ -51,7 +51,6 @@
 #include  "FchPlatform.h"
 #include  "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/ResetDefYangtze.c b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/ResetDefYangtze.c
index 77cb199..3b6146a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/ResetDefYangtze.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/ResetDefYangtze.c
@@ -51,7 +51,6 @@
 #include  "FchPlatform.h"
 #include  "Filecode.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataEnvService.c b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataEnvService.c
index 0ae0993..f1fc7d8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataEnvService.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataEnvService.c
@@ -66,7 +66,6 @@ SATA_PHY_SETTING SataPhyTable[] =
 };
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 //
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataService.c b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataService.c
index 9f526d8..be488b9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataService.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/YangtzeSataService.c
@@ -53,7 +53,6 @@
 #define FILECODE PROC_FCH_SATA_FAMILY_YANGTZE_YANGTZESATASERVICE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 UINT8  NumOfSataPorts = 2;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/GnbLibFeatures.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/GnbLibFeatures.c
index 4606d3d..16476db 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/GnbLibFeatures.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/GnbLibFeatures.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define  FILECODE PROC_GNB_COMMON_GNBLIBFEATURES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEarly.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEarly.c
index 9b1d908..e47f9d1 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEarly.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEarly.c
@@ -57,19 +57,16 @@
 #define FILECODE PROC_GNB_GNBINITATEARLY_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEarlyFeatureTable[];
 extern  OPTION_GNB_CONFIGURATION  GnbEarlierFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEnv.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEnv.c
index 7b93e91..e8a6fe4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEnv.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtEnv.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbEnvFeatureTable[];
 extern  BUILD_OPT_CFG UserOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtLate.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtLate.c
index c45e10a..2385837 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtLate.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtLate.c
@@ -55,7 +55,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATLATE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -64,13 +63,11 @@ extern  BUILD_OPT_CFG             UserOptions;
 extern  GNB_BUILD_OPTIONS         GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtMid.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtMid.c
index f786d77..1606e53 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtMid.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtMid.c
@@ -53,20 +53,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbMidFeatureTable[];
 extern  BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtPost.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtPost.c
index 6c5c7a1..89c0c5e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtPost.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtPost.c
@@ -55,7 +55,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern  OPTION_GNB_CONFIGURATION  GnbPostFeatureTable[];
@@ -63,13 +62,11 @@ extern  OPTION_GNB_CONFIGURATION  GnbPostAfterDramFeatureTable[];
 extern  BUILD_OPT_CFG             UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtReset.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtReset.c
index e60e18b..c7d4710 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtReset.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtReset.c
@@ -51,19 +51,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATRESET_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtS3Save.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtS3Save.c
index 2201ff6..d705c7e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtS3Save.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/GnbInitAtS3Save.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_GNBINITATS3SAVE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern  OPTION_GNB_CONFIGURATION  GnbS3SaveFeatureTable[];
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
index 34990c5..8f72255 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLib.c
@@ -60,20 +60,17 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_SERVICE  *ServiceTable;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
index 0430fba..2d93c3a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
@@ -53,19 +53,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBCPUACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
index 91af4bb..061ae30 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
@@ -55,13 +55,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBHEAP_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 VOID *
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
index 4e4fa7a..d0080f8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
@@ -55,19 +55,16 @@
 #include "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBIOACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
index ad6433b..5d6e08f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBMEMACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
index d9d708f..460c40a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBCOMMONLIB_GNBLIBPCIACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
index f42e3063..3d1dbf2 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
@@ -58,18 +58,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBFAMTRANSLATION_GNBPCIETRANSLATION_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /*----------------------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
index 1ae93d4..8ec5ba8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
@@ -60,18 +60,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBFAMTRANSLATION_GNBTRANSLATION_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
index 96dc841..258d460 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGENV_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,13 +66,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
index ae0128a..ed2c94c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
@@ -58,7 +58,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -66,13 +65,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
index 9cc594e..56d1b5b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGMID_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
index d7c2207..e5a163b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXCONFIG_GFXCONFIGPOST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -67,13 +66,11 @@ extern BUILD_OPT_CFG      UserOptions;
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
index 1c281ab..08c12c0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
@@ -57,13 +57,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXCARDINFO_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +74,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
index c9c9166..74eba23 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
@@ -62,14 +62,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GFXENUMCONNECTORS_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -99,7 +97,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
index f874e08..5eea787 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
@@ -59,21 +59,18 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINITLIBV1_GNBGFXINITLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 BOOLEAN
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxIntegratedInfoTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxIntegratedInfoTable.c
index 7b5f3ef..ac7659c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxIntegratedInfoTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxIntegratedInfoTable.c
@@ -71,18 +71,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINTTABLEV3_GFXINTEGRATEDINFOTABLE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c
index 1ad00c9..3a4fa1d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c
@@ -61,12 +61,10 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBGFXINTTABLEV3_GFXLIBV3_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST UINT16 GfxMemClockFrequencyDefinitionTableV3 [][8] = {
@@ -77,7 +75,6 @@ CONST UINT16 GfxMemClockFrequencyDefinitionTableV3 [][8] = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxPwrPlayTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxPwrPlayTable.c
index 4e83c44..4bccb13 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxPwrPlayTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxPwrPlayTable.c
@@ -63,12 +63,10 @@
 #define FILECODE PROC_GNB_MODULES_GNBGFXINTTABLEV3_GFXPWRPLAYTABLE_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -114,7 +112,6 @@ typedef struct {
 } PP_WORKSPACE_V2;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibKB.c
index 30ec1b3..1f45bf9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibKB.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_ALIBKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID *
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxEnvInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxEnvInitKB.c
index f0cbd18..6e6d138 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxEnvInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxEnvInitKB.c
@@ -67,7 +67,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXENVINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -75,13 +74,11 @@ extern GNB_TABLE ROMDATA      GfxEnvInitTableKB[];
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxGmcInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxGmcInitKB.c
index 234592b..9271fce 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxGmcInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxGmcInitKB.c
@@ -62,7 +62,6 @@
 
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXGMCINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_TABLE ROMDATA GfxGmcFeature1DisableKB [];
@@ -76,12 +75,10 @@ extern GNB_TABLE ROMDATA GfxGmcFeature1EnableKB [];
 #define DRAMTYPE_DDR3             1
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c
index 95c8d34..8f1bfe4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c
@@ -73,19 +73,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXINTEGRATEDINFOTABLEKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define GFX_REFCLK                        100     // (in MHz) Reference clock is 100 MHz
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxLibKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxLibKB.c
index 7523736..949f65e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxLibKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxLibKB.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXLIBKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxMidInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxMidInitKB.c
index 476c7845..8064964 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxMidInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxMidInitKB.c
@@ -71,13 +71,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXMIDINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -86,7 +84,6 @@ GfxMidInterfaceKB (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxPostInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxPostInitKB.c
index fa70f37..2bf0949 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxPostInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxPostInitKB.c
@@ -64,19 +64,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXPOSTINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxSamuInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxSamuInitKB.c
index 66cf992..f39d730 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxSamuInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxSamuInitKB.c
@@ -66,14 +66,12 @@
 
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GFXSAMUINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 #define LENGTH_1MBYTE             0x0100000ul
@@ -97,7 +95,6 @@ typedef struct {
 } SAMU_BOOT_CONTROL;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxTablesKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxTablesKB.c
index 9d37c4c..3b2eaec 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxTablesKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GfxTablesKB.c
@@ -55,19 +55,16 @@
 #include  "cpuFamilyTranslation.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEarlyInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEarlyInitKB.c
index 288884b..68f07a9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEarlyInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEarlyInitKB.c
@@ -63,7 +63,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBEARLYINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,13 +76,11 @@ extern BUILD_OPT_CFG     UserOptions;
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEnvInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEnvInitKB.c
index e9f41de..5842afc 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEnvInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbEnvInitKB.c
@@ -66,7 +66,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBENVINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS      GnbBuildOptions;
@@ -74,13 +73,11 @@ extern GNB_TABLE ROMDATA      GnbEnvInitTableKB [];
 extern GNB_TABLE ROMDATA      GnbIommuInitTableKB [];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c
index 41b7b17..89202ae 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c
@@ -64,21 +64,18 @@
 #include  "Filecode.h"
 //#define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBFUSETABLEKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbIommuTablesKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbIommuTablesKB.c
index 82f32dd..65953e6 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbIommuTablesKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbIommuTablesKB.c
@@ -53,19 +53,16 @@
 #include  "GnbRegistersKB.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,7 +74,6 @@
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbMidInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbMidInitKB.c
index b9ba10d..6eef700 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbMidInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbMidInitKB.c
@@ -68,7 +68,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBMIDINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -77,13 +76,11 @@ extern GNB_TABLE ROMDATA      GnbMidInitTableKB[];
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbPostInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbPostInitKB.c
index ce6eda2..62ad1a3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbPostInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbPostInitKB.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBPOSTINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbRegisterAccKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbRegisterAccKB.c
index 499275b..6b2b7a2 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbRegisterAccKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbRegisterAccKB.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBREGISTERACCKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define GNB_IGNORED_PARAM             0xFF
@@ -69,13 +68,11 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbTablesKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbTablesKB.c
index 2b8534b..dec511d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbTablesKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbTablesKB.c
@@ -52,19 +52,16 @@
 #include  "GnbTable.h"
 #include  "GnbRegistersKB.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +73,6 @@
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraKB.c
index c5eb8a1..cc3a741 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraKB.c
@@ -61,18 +61,15 @@
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBURAKB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraTokenMapKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraTokenMapKB.c
index 2d75fce..94c731a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraTokenMapKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbUraTokenMapKB.c
@@ -54,13 +54,11 @@
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_GNBURATOKENMAPKB_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +68,6 @@ GnbUraLocateRegTblKB (
   IN OUT   UINT32        *UraTableAddress
   );
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieComplexDataKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieComplexDataKB.c
index 8630312..96a2378 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieComplexDataKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieComplexDataKB.c
@@ -57,19 +57,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIECOMPLEXDATAKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieConfigKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieConfigKB.c
index bc87dde..67fc836 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieConfigKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieConfigKB.c
@@ -62,7 +62,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIECONFIGKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define DEVFUNC(d, f) ((((UINT8) d) << 3) | ((UINT8) f))
@@ -70,7 +69,6 @@
 extern PCIe_LANE_ALLOC_DESCRIPTOR ROMDATA   PcieLaneAllocConfigurationKB[];
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8*
@@ -97,7 +95,6 @@ PcieMapPortPciAddressKB (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 CONST CHAR8*
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEarlyInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEarlyInitKB.c
index f0624d4..b8a2d0d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEarlyInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEarlyInitKB.c
@@ -67,7 +67,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIEEARLYINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -78,13 +77,11 @@ extern CONST PCIE_HOST_REGISTER_TABLE_HEADER ROMDATA CoreInitTableKB;
 extern CONST PCIE_PORT_REGISTER_TABLE_HEADER ROMDATA PortInitEarlyTableKB;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEnvInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEnvInitKB.c
index 9656f26..380484df 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEnvInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieEnvInitKB.c
@@ -54,19 +54,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIEENVINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieLibKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieLibKB.c
index 61b0725..154621e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieLibKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieLibKB.c
@@ -68,19 +68,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIELIBKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 PCIE_LINK_SPEED_CAP
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieMidInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieMidInitKB.c
index d1c39d3..e1bc450 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieMidInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieMidInitKB.c
@@ -63,20 +63,17 @@
 
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIEMIDINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern CONST PCIE_PORT_REGISTER_TABLE_HEADER ROMDATA PortInitMidTableKB;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PciePostInitKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PciePostInitKB.c
index 77fb825..a56d7cb 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PciePostInitKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PciePostInitKB.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBINITKB_PCIEPOSTINITKB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieTablesKB.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieTablesKB.c
index 10f8828..55bc245 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieTablesKB.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/PcieTablesKB.c
@@ -52,19 +52,16 @@
 #include  "GnbRegistersKB.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/GnbIoapic.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/GnbIoapic.c
index 3a7c6ac..ee0c506 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/GnbIoapic.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/GnbIoapic.c
@@ -58,19 +58,16 @@
 #include  "GnbRegistersCommonV2.h"
 #define FILECODE PROC_GNB_MODULES_GNBIOAPIC_GNBIOAPIC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
index b26679b..81faddf 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
@@ -62,14 +62,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV4_GNBNBINITLIBV4_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define SMC_RAM_START_ADDR 0x10000ul
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,7 +77,6 @@ typedef struct {
 } GNB_TOPOLOGY_INFO_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/GnbNbInitLibV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/GnbNbInitLibV5.c
index 516739a..7a55ef2 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/GnbNbInitLibV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/GnbNbInitLibV5.c
@@ -59,19 +59,16 @@
 #include  "GnbF1Table.h"
 #define FILECODE PROC_GNB_MODULES_GNBNBINITLIBV5_GNBNBINITLIBV5_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/PcieAlibV2.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/PcieAlibV2.c
index 0fb763b..870f55c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/PcieAlibV2.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/PcieAlibV2.c
@@ -69,7 +69,6 @@
 
 #define FILECODE PROC_GNB_MODULES_GNBPCIEALIBV2_PCIEALIBV2_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,13 +78,11 @@ extern  GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
index 2233989..f9c5c79 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
@@ -58,13 +58,11 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEASPM_PCIEASPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +74,6 @@ typedef struct {
 } PCIE_ASPM_DATA;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
index 64f01c0..82f97ac 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
@@ -56,18 +56,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECLKPM_PCIECLKPM_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
index d498ad0..e245837 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
@@ -57,19 +57,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_GNBHANDLELIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
index 5a25844..d8b1c00 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
@@ -65,7 +65,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGDATA_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,7 +72,6 @@ extern BUILD_OPT_CFG UserOptions;
 extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +79,6 @@ extern GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions;
 #define PcieConfigAttachParent(P, C) (C)->Parent = (UINT16) ((UINT8 *) C - (UINT8 *) P);
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
index 8e5e3dd..5d2af03 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIECONFIGLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
index 274dabb..2f35947 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEINPUTPARSER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 PCIe_COMPLEX_DESCRIPTOR*
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
index cb24a9b..59099e7 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIECONFIG_PCIEMAPTOPOLOGY_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
index 64e7cb3..cea2e73 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
@@ -54,18 +54,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEASPMBLACKLIST_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
index 2c9d1ce..a70d04e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
@@ -59,7 +59,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPIFSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -73,18 +72,15 @@
 #define PIF_GANG_ALL   (0x1 << 25)
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
index 3fc8561..b80e6a7 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
@@ -57,19 +57,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTREGACC_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
index c6688eb..108e709 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEPORTSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 UINT8 L1State = 0x1b;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
index 2a7a0db..8c328ed 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETIMER_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
index 5151fb4..efcbde3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIETOPOLOGYSERVICES_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
index 6af26de..2cb3882 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV1_PCIEUTILITYLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 /// Lane type
@@ -79,7 +78,6 @@ typedef enum {
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -88,7 +86,6 @@ typedef struct {
 } PCIE_GLOBAL_GEN_CAP_WORKSPACE;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
index fc43dee..0409c85 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV4_PCIEPORTSERVICESV4_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
index 2d1a9dd..f49576b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
@@ -61,19 +61,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV4_PCIEWRAPPERSERVICESV4_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePhyServicesV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePhyServicesV5.c
index bc50234..2e65cd3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePhyServicesV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePhyServicesV5.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV5_PCIEPHYSERVICESV5_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -87,7 +84,6 @@ PciePhyChannelCharacteristicV5 (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePifServicesV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePifServicesV5.c
index 1f7dc65..1a8d642 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePifServicesV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePifServicesV5.c
@@ -59,18 +59,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV5_PCIEPIFSERVICESV5_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
@@ -93,7 +90,6 @@ PciePifSetLs2ExitTimeV5 (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePortServicesV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePortServicesV5.c
index 803d134..2559168 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePortServicesV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PciePortServicesV5.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV5_PCIEPORTSERVICESV5_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieSiliconServicesV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieSiliconServicesV5.c
index 0b2be80..898d50b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieSiliconServicesV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieSiliconServicesV5.c
@@ -57,18 +57,15 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV5_PCIESILICONSERVICESV5_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieTopologyServicesV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieTopologyServicesV5.c
index 9c602e1..3a421d0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieTopologyServicesV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieTopologyServicesV5.c
@@ -62,18 +62,15 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV5_PCIETOPOLOGYSERVICESV5_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieWrapperServicesV5.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieWrapperServicesV5.c
index 89547bf..78985ab 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieWrapperServicesV5.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/PcieWrapperServicesV5.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIEINITLIBV5_PCIEWRAPPERSERVICESV5_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/PcieMaxPayload.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/PcieMaxPayload.c
index edf8772..e385676 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/PcieMaxPayload.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/PcieMaxPayload.c
@@ -61,14 +61,12 @@
 #define FILECODE PROC_GNB_MODULES_GNBPCIEMAXPAYLOAD_PCIEMAXPAYLOAD_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 extern GNB_BUILD_OPTIONS  GnbBuildOptions;
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 typedef struct {
@@ -78,7 +76,6 @@ typedef struct {
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieTrainingV2.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieTrainingV2.c
index 36044ac..a4bd3de 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieTrainingV2.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieTrainingV2.c
@@ -62,19 +62,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV2_PCIETRAININGV2_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieWorkaroundsV2.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieWorkaroundsV2.c
index 159ea3e..a6150bf 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieWorkaroundsV2.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/PcieWorkaroundsV2.c
@@ -59,14 +59,12 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBPCIETRAININGV2_PCIEWORKAROUNDSV2_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 extern BUILD_OPT_CFG UserOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -111,7 +109,6 @@ PcieIsDeskewCardDetected (
   );
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
index 4370506..69bfdd1 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
@@ -59,19 +59,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSSOCKETLIB_GNBSSOCKETLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 PCI_ADDR
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
index 209da23..5cec1a3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
@@ -55,19 +55,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBLIB_GNBSBLIB_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 UINT32
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
index cc8cbf8..b7f2879 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
@@ -58,19 +58,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSBLIB_GNBSBPCIE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/GnbScsLibV1.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/GnbScsLibV1.c
index 9113029..19c38b3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/GnbScsLibV1.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/GnbScsLibV1.c
@@ -60,7 +60,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSCSLIBV1_GNBSCSLIBV1_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,12 +70,10 @@
 extern GNB_BUILD_OPTIONS GnbBuildOptions;
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/GnbSmuInitLibV7.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/GnbSmuInitLibV7.c
index 2f40389..cbd455e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/GnbSmuInitLibV7.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/GnbSmuInitLibV7.c
@@ -61,7 +61,6 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSMULIBV7_GNBSMUINITLIBV7_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,12 +70,10 @@
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 VOID
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/GnbSview.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/GnbSview.c
index 4ebb28f..c7dbe35 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/GnbSview.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/GnbSview.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBSVIEW_GNBSVIEW_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/GnbTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/GnbTable.c
index 82b2348..5d865d4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/GnbTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/GnbTable.c
@@ -60,19 +60,16 @@
 #include  "Filecode.h"
 #define FILECODE PROC_GNB_MODULES_GNBTABLE_GNBTABLE_FILECODE
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/GnbUraLibV1.c b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/GnbUraLibV1.c
index 7156f7e..eeaf64f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/GnbUraLibV1.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/GnbUraLibV1.c
@@ -60,19 +60,16 @@
 #define FILECODE PROC_GNB_MODULES_GNBURALIBV1_GNBURALIBV1_FILECODE
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/IdsLib.h b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/IdsLib.h
index 355cd1f..2fbc8c8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/IdsLib.h
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/IdsLib.h
@@ -158,7 +158,6 @@ typedef struct _IDS_RUNCODE_PARAMS {
 #define IDS_ALL_DCT   0xFF
 
 /*----------------------------------------------------------------------------------------
- *                        F U N C T I O N    P R O T O T Y P E
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/mu.c b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/mu.c
index a4e5716..f4469ac 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/mu.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/mu.c
@@ -62,17 +62,14 @@
 #include "Filecode.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -112,7 +109,6 @@ AlignPointerTo16Byte (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/amdAcpiIvrs.c b/src/vendorcode/amd/cimx/rd890/amdAcpiIvrs.c
index c710bf0..bb3ee7b 100644
--- a/src/vendorcode/amd/cimx/rd890/amdAcpiIvrs.c
+++ b/src/vendorcode/amd/cimx/rd890/amdAcpiIvrs.c
@@ -49,24 +49,20 @@
 #include "amdAcpiIvrs.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/amdAcpiLib.c b/src/vendorcode/amd/cimx/rd890/amdAcpiLib.c
index 60b5ffe..2ffeb31 100644
--- a/src/vendorcode/amd/cimx/rd890/amdAcpiLib.c
+++ b/src/vendorcode/amd/cimx/rd890/amdAcpiLib.c
@@ -48,24 +48,20 @@
 #include "amdAcpiLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/amdAcpiMadt.c b/src/vendorcode/amd/cimx/rd890/amdAcpiMadt.c
index daf2c1f..b60f2a3 100644
--- a/src/vendorcode/amd/cimx/rd890/amdAcpiMadt.c
+++ b/src/vendorcode/amd/cimx/rd890/amdAcpiMadt.c
@@ -48,24 +48,20 @@
 #include "amdAcpiLib.h"
 #include "amdAcpiMadt.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/amdDebugOutLib.c b/src/vendorcode/amd/cimx/rd890/amdDebugOutLib.c
index f40852b..e241b17 100644
--- a/src/vendorcode/amd/cimx/rd890/amdDebugOutLib.c
+++ b/src/vendorcode/amd/cimx/rd890/amdDebugOutLib.c
@@ -48,7 +48,6 @@
 #include "amdlib.h"
 #include "amdDebugOutLib.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define COM_BASE_ADDRESS  0x3f8
@@ -71,7 +70,6 @@ typedef CHAR8   *va_list;
 #endif
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +79,6 @@ typedef struct {
 } StringBuffer;
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -126,7 +123,6 @@ VOID
 InitSerialOut (VOID);
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/amdSbLib.c b/src/vendorcode/amd/cimx/rd890/amdSbLib.c
index 22b7fb1..2167029 100644
--- a/src/vendorcode/amd/cimx/rd890/amdSbLib.c
+++ b/src/vendorcode/amd/cimx/rd890/amdSbLib.c
@@ -50,24 +50,20 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbDispatcher.c b/src/vendorcode/amd/cimx/rd890/nbDispatcher.c
index 16e86a1..7e90516 100644
--- a/src/vendorcode/amd/cimx/rd890/nbDispatcher.c
+++ b/src/vendorcode/amd/cimx/rd890/nbDispatcher.c
@@ -49,25 +49,21 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 extern AMD_MODULE_HEADER mNbModuleID;
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbEventLog.c b/src/vendorcode/amd/cimx/rd890/nbEventLog.c
index 4c228b0..a57aa44 100644
--- a/src/vendorcode/amd/cimx/rd890/nbEventLog.c
+++ b/src/vendorcode/amd/cimx/rd890/nbEventLog.c
@@ -50,18 +50,15 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbHtInit.c b/src/vendorcode/amd/cimx/rd890/nbHtInit.c
index 687219a..9b8b2f2 100644
--- a/src/vendorcode/amd/cimx/rd890/nbHtInit.c
+++ b/src/vendorcode/amd/cimx/rd890/nbHtInit.c
@@ -49,13 +49,11 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 #define LINK_BUFFERS_IFCM  ((1 << 31) + (1 << 25) + (8 << 20) + (1 << 18) + (1 << 8) + (6 << 5) + 0xF)
@@ -66,7 +64,6 @@
 typedef VOID DUMMY_CALL (VOID);
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -76,7 +73,6 @@ NbInitRasParityMacro (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbHtInterface.c b/src/vendorcode/amd/cimx/rd890/nbHtInterface.c
index ecb5e0d..68f84da 100644
--- a/src/vendorcode/amd/cimx/rd890/nbHtInterface.c
+++ b/src/vendorcode/amd/cimx/rd890/nbHtInterface.c
@@ -49,23 +49,19 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbInit.c b/src/vendorcode/amd/cimx/rd890/nbInit.c
index 8a5c5db..0d263d5 100644
--- a/src/vendorcode/amd/cimx/rd890/nbInit.c
+++ b/src/vendorcode/amd/cimx/rd890/nbInit.c
@@ -48,23 +48,19 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbInitializer.c b/src/vendorcode/amd/cimx/rd890/nbInitializer.c
index ab4a004..db3aca7 100644
--- a/src/vendorcode/amd/cimx/rd890/nbInitializer.c
+++ b/src/vendorcode/amd/cimx/rd890/nbInitializer.c
@@ -48,18 +48,15 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -74,7 +71,6 @@ NbInitializer (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbInterface.c b/src/vendorcode/amd/cimx/rd890/nbInterface.c
index 7d41b26..f833a16 100644
--- a/src/vendorcode/amd/cimx/rd890/nbInterface.c
+++ b/src/vendorcode/amd/cimx/rd890/nbInterface.c
@@ -49,23 +49,19 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbIoApic.c b/src/vendorcode/amd/cimx/rd890/nbIoApic.c
index 045883d..d67a35b 100644
--- a/src/vendorcode/amd/cimx/rd890/nbIoApic.c
+++ b/src/vendorcode/amd/cimx/rd890/nbIoApic.c
@@ -48,23 +48,19 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbIommu.c b/src/vendorcode/amd/cimx/rd890/nbIommu.c
index 705b1a8..31e4a89 100644
--- a/src/vendorcode/amd/cimx/rd890/nbIommu.c
+++ b/src/vendorcode/amd/cimx/rd890/nbIommu.c
@@ -174,7 +174,6 @@ RD890S_DfltDevices = {
 };
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
 */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbIommu.h b/src/vendorcode/amd/cimx/rd890/nbIommu.h
index 7fc2c5c..7de3450 100644
--- a/src/vendorcode/amd/cimx/rd890/nbIommu.h
+++ b/src/vendorcode/amd/cimx/rd890/nbIommu.h
@@ -61,7 +61,6 @@
 #define _NBIOMMU_H_
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -92,7 +91,6 @@ NbIommuDisconnectPcieCore (
   );
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
@@ -242,7 +240,6 @@ NbIommuDisconnectPcieCore (
 #define MADT_APIC_BASE          0x4
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbLib.c b/src/vendorcode/amd/cimx/rd890/nbLib.c
index 5862768..184683a 100644
--- a/src/vendorcode/amd/cimx/rd890/nbLib.c
+++ b/src/vendorcode/amd/cimx/rd890/nbLib.c
@@ -49,23 +49,19 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbMaskedMemoryInit.c b/src/vendorcode/amd/cimx/rd890/nbMaskedMemoryInit.c
index 8394835..baa3b05 100644
--- a/src/vendorcode/amd/cimx/rd890/nbMaskedMemoryInit.c
+++ b/src/vendorcode/amd/cimx/rd890/nbMaskedMemoryInit.c
@@ -49,23 +49,19 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 extern  UINT16 NbInitMaskedMemoryLength;
diff --git a/src/vendorcode/amd/cimx/rd890/nbMiscInit.c b/src/vendorcode/amd/cimx/rd890/nbMiscInit.c
index ded6934..65af807 100644
--- a/src/vendorcode/amd/cimx/rd890/nbMiscInit.c
+++ b/src/vendorcode/amd/cimx/rd890/nbMiscInit.c
@@ -48,23 +48,19 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbModuleInfo.c b/src/vendorcode/amd/cimx/rd890/nbModuleInfo.c
index 175e3b3..88cf7be 100644
--- a/src/vendorcode/amd/cimx/rd890/nbModuleInfo.c
+++ b/src/vendorcode/amd/cimx/rd890/nbModuleInfo.c
@@ -51,13 +51,11 @@
 #define Int32FromChar(a,b,c,d) ((a) << 0 | (b) << 8 | (c) << 16 | (d) << 24)
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 VOLATILE  AMD_MODULE_HEADER mNbModuleID = {
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieAspm.c b/src/vendorcode/amd/cimx/rd890/nbPcieAspm.c
index 38bc41f..8aa4139 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieAspm.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieAspm.c
@@ -50,18 +50,15 @@
 #include "amdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -81,7 +78,6 @@ PcieSetDeviceAspm (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieCplBuffers.c b/src/vendorcode/amd/cimx/rd890/nbPcieCplBuffers.c
index a77623e..635b960 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieCplBuffers.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieCplBuffers.c
@@ -48,18 +48,15 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieEarlyHwLib.c b/src/vendorcode/amd/cimx/rd890/nbPcieEarlyHwLib.c
index 1111556..3965147 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieEarlyHwLib.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieEarlyHwLib.c
@@ -48,26 +48,22 @@
 #include "NbPlatform.h"
 #include "HotplugFirmware.h"
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 #define MCU_CLEAR_BLOCK_LENGTH  16
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieHotplug.c b/src/vendorcode/amd/cimx/rd890/nbPcieHotplug.c
index 25ef38f..087a7f3 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieHotplug.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieHotplug.c
@@ -51,7 +51,6 @@
 #ifndef  HOTPLUG_SUPPORT_DISABLED
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 #define ATTN_BUTTON_PRESENT     BIT0
@@ -81,17 +80,14 @@
 #define SERVER_HOTPLUG  1
 #define NATIVE_HOTPLUG  2
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieInitEarly.c b/src/vendorcode/amd/cimx/rd890/nbPcieInitEarly.c
index 6fdf2b1..d725b64 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieInitEarly.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieInitEarly.c
@@ -50,24 +50,20 @@
 #include "amdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieInitLate.c b/src/vendorcode/amd/cimx/rd890/nbPcieInitLate.c
index 17ae4f7..5f0de59 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieInitLate.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieInitLate.c
@@ -51,23 +51,19 @@
 #include "amdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieLateHwLib.c b/src/vendorcode/amd/cimx/rd890/nbPcieLateHwLib.c
index 8b1782e..161e148 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieLateHwLib.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieLateHwLib.c
@@ -49,13 +49,11 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieLib.c b/src/vendorcode/amd/cimx/rd890/nbPcieLib.c
index 2e91cb6..98969a1 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieLib.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieLib.c
@@ -50,19 +50,16 @@
 #include "amdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -79,7 +76,6 @@ PcieLibValidateGfxConfig (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieLinkWidth.c b/src/vendorcode/amd/cimx/rd890/nbPcieLinkWidth.c
index ec3ec80..62e6719 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieLinkWidth.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieLinkWidth.c
@@ -48,18 +48,15 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPciePllControl.c b/src/vendorcode/amd/cimx/rd890/nbPciePllControl.c
index ec2206b..7bbdc51 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPciePllControl.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPciePllControl.c
@@ -48,19 +48,16 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -71,7 +68,6 @@ PciePllOffCheckFunction (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPciePortRemap.c b/src/vendorcode/amd/cimx/rd890/nbPciePortRemap.c
index 639f149..20d2244d 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPciePortRemap.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPciePortRemap.c
@@ -48,19 +48,16 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
@@ -70,7 +67,6 @@ PciePortRemapAllocateDeviceId (
   IN      UINT8           *UnusedPortMap
 );
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieRecovery.c b/src/vendorcode/amd/cimx/rd890/nbPcieRecovery.c
index 918fbd4..852a13d 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieRecovery.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieRecovery.c
@@ -50,24 +50,20 @@
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieSb.c b/src/vendorcode/amd/cimx/rd890/nbPcieSb.c
index 3ef6094..c96b7b9 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieSb.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieSb.c
@@ -50,23 +50,19 @@
 #include "amdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPcieWorkarounds.c b/src/vendorcode/amd/cimx/rd890/nbPcieWorkarounds.c
index 771c489..234291e 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPcieWorkarounds.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPcieWorkarounds.c
@@ -49,18 +49,15 @@
 #include "amdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -93,7 +90,6 @@ PcieIsDeskewCardDetected (
   );
 
  /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/rd890/nbPowerOnReset.c b/src/vendorcode/amd/cimx/rd890/nbPowerOnReset.c
index cde7d06..df61f29 100644
--- a/src/vendorcode/amd/cimx/rd890/nbPowerOnReset.c
+++ b/src/vendorcode/amd/cimx/rd890/nbPowerOnReset.c
@@ -50,18 +50,15 @@
 #include "amdDebugOutLib.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 AGESA_STATUS
@@ -70,7 +67,6 @@ NbPorInitValidateInput (
   );
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /// PCI registers init table
diff --git a/src/vendorcode/amd/cimx/rd890/nbRecovery.c b/src/vendorcode/amd/cimx/rd890/nbRecovery.c
index 71c6959..6d8d7c5 100644
--- a/src/vendorcode/amd/cimx/rd890/nbRecovery.c
+++ b/src/vendorcode/amd/cimx/rd890/nbRecovery.c
@@ -49,18 +49,15 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 /// PCI registers init table
diff --git a/src/vendorcode/amd/cimx/rd890/nbRecoveryInitializer.c b/src/vendorcode/amd/cimx/rd890/nbRecoveryInitializer.c
index f9b6132..e8a145d 100644
--- a/src/vendorcode/amd/cimx/rd890/nbRecoveryInitializer.c
+++ b/src/vendorcode/amd/cimx/rd890/nbRecoveryInitializer.c
@@ -49,18 +49,15 @@
 #include "NbPlatform.h"
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/sb800/DISPATCHER.c b/src/vendorcode/amd/cimx/sb800/DISPATCHER.c
index 84bbccb..6036f27 100644
--- a/src/vendorcode/amd/cimx/sb800/DISPATCHER.c
+++ b/src/vendorcode/amd/cimx/sb800/DISPATCHER.c
@@ -52,7 +52,6 @@
 #include "cbtypes.h"
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
 */
 
@@ -66,12 +65,10 @@ VOID* VerifyImage (IN UINT64 Signature, IN VOID* ImagePtr);
 VOID* LocateImage (IN UINT64 Signature);
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/sb800/SbModInf.c b/src/vendorcode/amd/cimx/sb800/SbModInf.c
index 6ce0df9..04cfff3 100644
--- a/src/vendorcode/amd/cimx/sb800/SbModInf.c
+++ b/src/vendorcode/amd/cimx/sb800/SbModInf.c
@@ -52,13 +52,11 @@
 #include "cbtypes.h"
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/sb900/Dispatcher.c b/src/vendorcode/amd/cimx/sb900/Dispatcher.c
index 4952313..3ed81f4 100644
--- a/src/vendorcode/amd/cimx/sb900/Dispatcher.c
+++ b/src/vendorcode/amd/cimx/sb900/Dispatcher.c
@@ -50,7 +50,6 @@
 #include "AmdSbLib.h"
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
 */
 
@@ -64,12 +63,10 @@ VOID* VerifyImage (IN UINT64 Signature, IN VOID* ImagePtr);
 VOID* LocateImage (IN UINT64 Signature);
 
 /*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U  R E S
  *----------------------------------------------------------------------------------------
  */
 
 /*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
diff --git a/src/vendorcode/amd/cimx/sb900/SbModInf.c b/src/vendorcode/amd/cimx/sb900/SbModInf.c
index 1fb6fd7..8cc7044 100644
--- a/src/vendorcode/amd/cimx/sb900/SbModInf.c
+++ b/src/vendorcode/amd/cimx/sb900/SbModInf.c
@@ -52,13 +52,11 @@
 #include "cbtypes.h"
 
 /*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U  N C T I O N S
  *----------------------------------------------------------------------------------------
  */
 
 
 /*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
  */
 

