1. Correct File header to ## @file

2. Remove unnecessary .common] postfix on section. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10052 6f19259b-4bc3-4df7-8a09-765794883524
2010-02-24 00:21:16 +00:00
parent 7b202cb0f9
commit 6bfbb5f0e0
259 changed files with 1037 additions and 1034 deletions
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Cache Maintenance Library using Base Library services.
 #
 #  Cache Maintenance Library that uses Base Library services to maintain caches.
 #  This library assumes there are no chipset dependencies required to maintain caches.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation<BR>
+#  Copyright (c) 2007 - 2010, Intel Corporation<BR>
 #  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
 #
 #  All rights reserved. This program and the accompanying materials
@@ -15,7 +15,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -48,7 +48,7 @@
 [Packages]
  MdePkg/MdePkg.dec

-[LibraryClasses.common]
+[LibraryClasses]
  BaseLib
  DebugLib

--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 #  Instance of CPU Library for various architecture.
 #
 #  CPU Library implemented using ASM functions for IA-32 and X64,
@@ -15,7 +15,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Debug Library with empty functions.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DebugLib.c


--- a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+++ b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
 #  Instance of Debug Library based on Serial Port Library.
 #  It uses Print Library to produce formatted output strings.
 #
-#  Copyright (c) 2006 - 2008, Intel Corporation.
+#  Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DebugLib.c

 [Packages]
@@ -39,7 +39,7 @@
  PrintLib
  BaseLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
 #  Instance of I/O Library using compiler intrinsics.
 #
 #  I/O Library that uses compiler intrinsics to perform IN and OUT instructions
 #  for IA-32 and x64.  On IPF, I/O port requests are translated into MMIO requests.
 #  MMIO requests are forwarded directly to memory.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.<BR>
+#  Copyright (c) 2007 - 2010, Intel Corporation.<BR>
 #  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
 #
 #  All rights reserved. This program and the accompanying materials
@@ -16,7 +16,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF ARM
 #

-[Sources.common]
+[Sources]
  IoLibMmioBuffer.c
  BaseIoLibIntrinsicInternal.h
  IoHighLevel.c
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Base Library implementation.
 #
-#  Copyright (c) 2007 - 2009, Intel Corporation.<BR>
+#  Copyright (c) 2007 - 2010, Intel Corporation.<BR>
 #  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
 #
 #  All rights reserved. This program and the accompanying materials
@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM
 #

-[Sources.common]
+[Sources]
  CheckSum.c
  SwitchStack.c
  SwapBytes64.c
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+++ b/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Instance of Base Memory Library without assembly.
 #
 #  Base Memory Library implementation - no ASM.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  SetMem.c
  ScanMem64Wrapper.c
  ScanMem32Wrapper.c
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Base Memory Library using MMX registers.
 #
 #  Base Memory Library that uses MMX registers for high performance.
 #  Optimized for use in DXE.
 #
-#  Copyright (c) 2006 - 2008, Intel Corporation.
+#  Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -33,7 +33,7 @@
  MdePkg/MdePkg.dec


-[Sources.common]
+[Sources]
  ScanMem64Wrapper.c
  ScanMem32Wrapper.c
  ScanMem16Wrapper.c
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Base Memory Library optimized for use in DXE phase.
 #
 #  Base Memory Library that is optimized for use in DXE phase.  
 #  Uses REP, MMX, XMM registers as required for best performance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64
 #

-[Sources.common]
+[Sources]
  MemLibInternals.h

 [Sources.Ia32]
--- a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
+++ b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Base Memory Library optimized for use in PEI phase.
 #
 #  Base Memory Library that is optimized for use in PEI phase.  
 #  Uses REP, MMX, XMM registers as required for best performance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64
 #

-[Sources.common]
+[Sources]
  MemLibInternals.h

 [Sources.Ia32]
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Base Memory Library using REP string instructions.
 #
 #  Base Memory Library that uses REP string instructions for
 #  high performance and small size. Optimized for use in PEI.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64
 #

-[Sources.common]
+[Sources]
  MemLibInternals.h
  ScanMem64Wrapper.c
  ScanMem32Wrapper.c
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Base Memory Library using XMM registers.
 #
 #  Base Memory Library that uses XMM registers for high performance.
 #  Optimized for use in DXE.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64
 #

-[Sources.common]
+[Sources]
  MemLibInternals.h
  ScanMem64Wrapper.c
  ScanMem32Wrapper.c
--- a/MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
+++ b/MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Null instance of PAL Library with empty functions.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IPF
 #

-[Sources.common]
+[Sources]
  PalCall.c


--- a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+++ b/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of PCD Library without support of dynamic PCD entries.
 #
 #  PCD Library that only provides access to Feature Flag, Fixed At Build,
 #  and Binary Patch typed PCD entries. Access to Dynamic PCD entries is ignored.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PcdLib.c

 [LibraryClasses]
--- a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+++ b/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of PCI CF8 Library using I/O ports 0xCF8 and 0xCFC.
 #
 #  PCI CF8 Library that uses I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.
 #  Layers on top of an I/O Library instance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciCf8Lib.c

 [Packages]
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of PCI Express Library using the 256 MB PCI Express MMIO window.
 #
 #  PCI Express Library that uses the 256 MB PCI Express MMIO window to perform
 #  PCI Configuration cycles. Layers on top of an I/O Library instance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciExpressLib.c

 [Packages]
@@ -40,6 +40,6 @@
  DebugLib
  IoLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

--- a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
+++ b/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of PCI Library based on PCI CF8 Library.
 #
 #  PCI Library that uses I/O ports 0xCF8 and 0xCFC to perform
 #  PCI Configuration cycles. Layers on top of one PCI CF8 Library instance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciLib.c

 [Packages]
--- a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
+++ b/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of PCI Library based on PCI Express Library.
 #
 #  PCI Library that uses the 256 MB PCI Express MMIO window to perform PCI
 #  Configuration cycles. Layers on one PCI Express Library instance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciLib.c

 [Packages]
--- a/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
+++ b/MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Null PE/Coff Extra Action library instances with empty functions.
 #
-#  Copyright (c) 2009, Intel Corporation.
+#  Copyright (c) 2009 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,13 +26,13 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PeCoffExtraActionLib.c

 [Packages]
  MdePkg/MdePkg.dec

-[LibraryClasses.common]
+[LibraryClasses]
  DebugLib


--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+++ b/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  PE/COFF Entry Point Library implementation.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PeCoffGetEntryPoint.c


--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  PE/COFF Loader Library implementation.
 #  The IPF version library supports loading IPF and EBC PE/COFF image.
 #  The IA32 version library support loading IA32, X64 and EBC PE/COFF images.
 #  The X64 version library support loading IA32, X64 and EBC PE/COFF images.
 #
-#  Copyright (c) 2006 - 2009, Intel Corporation.<BR>
+#  Copyright (c) 2006 - 2010, Intel Corporation.<BR>
 #  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
 #
 #  All rights reserved. This program and the accompanying materials
@@ -15,7 +15,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM
 #

-[Sources.common]
+[Sources]
  BasePeCoffLibInternals.h
  BasePeCoff.c

--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
+++ b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 #  Instance of Performance Library based on Base Library.
 #
 #  Performance Library that layers on top of the Base Library to measure start
 #  and end times using CPU specific timer services if they are available.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PerformanceLib.c


@@ -42,6 +42,6 @@
  DebugLib


-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask

--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+++ b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Instance of Post Code Library based on Debug Library.
 #
 #  Post Code Library that layers on top of a Debug Library instance.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #


-[Sources.common]
+[Sources]
  PostCode.c


@@ -43,6 +43,6 @@
  DebugLib


-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask

--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+++ b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Instance of Post Code Library using I/O port 0x80.
 #
 #  Post Code Library that writes post code values to I/O port 0x80.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PostCode.c


@@ -41,6 +41,6 @@
  PcdLib


-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask

--- a/MdePkg/Library/BasePrintLib/BasePrintLib.inf
+++ b/MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Print Library implementation.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #


-[Sources.common]
+[Sources]
  PrintLibInternal.h
  PrintLibInternal.c
  PrintLib.c
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+++ b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Report Status Code Library with empty functions.
 #
-# Copyright (c) 2009, Intel Corporation.
+# Copyright (c) 2009 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  BaseReportStatusCodeLib.c

 [Packages]
--- a/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
+++ b/MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  Null instance of Serial Port Library with empty functions.
 #
-#  Copyright (c) 2006 - 2008, Intel Corporation.
+#  Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  BaseSerialPortLibNull.c


--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 #  Base Synchronization Library implementation.
 #
 #  Copyright (c) 2007 - 2010, Intel Corporation.<BR>
@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -25,7 +25,7 @@
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM
 #
-[Sources.Common]
+[Sources]
  BaseSynchronizationLibInternals.h

 [Sources.IA32]
@@ -95,5 +95,5 @@
  DebugLib
  BaseMemoryLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout
--- a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+++ b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 #  NULL instance of Timer Library as a template.
 #
 #  A non-functional instance of the Timer Library that can be used as a template
@@ -6,7 +6,7 @@
 #  also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer
 #  services as well as EBC modules that require timer services.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -16,7 +16,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  TimerLibNull.c


--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  UEFI Decompress Library implementation.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  BaseUefiDecompressLibInternals.h
  BaseUefiDecompressLib.c

--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
+++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # Module entry point library for DXE core.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  DxeCoreEntryPoint.c


--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
+++ b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of HOB Library for DXE Core.
 #
 # HOB Library implementation for the DXE Core. Does not have a constructor.
 #  Uses gHobList defined in the DXE Core Entry Point Library.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  HobLib.c

 [Packages]
--- a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # Instance of ExtractGuidedSection Library for DXE phase.
 #
 # This library provides generic extract guided section functions for DXE module.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DxeExtractGuidedSectionLib.c

 [Packages]
--- a/MdePkg/Library/DxeHobLib/DxeHobLib.inf
+++ b/MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of HOB Library using HOB list from EFI Configuration Table.
 #
 # HOB Library implementation that retrieves the HOB List
 #  from the System Configuration Table in the EFI System Table.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  HobLib.c


--- a/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of PCD Library using PCD Protocol.
 #
 # There are two PCD PPIs as follows:
@@ -13,7 +13,7 @@
 # This library instance uses the PCD_PROTOCOL to handle dynamic PCD request and use
 # EFI_PCD_PROTOCOL to handle dynamicEx type PCD.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -23,7 +23,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -38,7 +38,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DxePcdLib.c


--- a/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
+++ b/MdePkg/Library/DxeRuntimePciExpressLib/DxeRuntimePciExpressLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of PCI Express Library using the 256 MB PCI Express MMIO window that 
 # is safe for runtime use.
 #
@@ -7,7 +7,7 @@
 #  PCI devices that are registered for for runtime access is maintained so the 
 #  proper virtual address is used to perform the PCI Express Configuration cycle.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,7 +17,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -33,7 +33,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciExpressLib.c

 [Packages]
@@ -49,7 +49,7 @@
  DxeServicesTableLib
  UefiRuntimeLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES

 [Guids]
--- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # DXE Services Library provides access data from sections of FFS files based on FV protocol.
 # It also provides access file based on file path from a firmware volume, 
 # from a file system interface, or from the load file interface.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DxeServicesLib.c

 [Packages]
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+++ b/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of DXE Services Table Library using EFI Configuration Table.
 #
 # DXE Services Table Library that retrieves a pointer to the DXE Services
 # Table from the Configuration Table in the EFI System Table.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DxeServicesTableLib.c


--- a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
+++ b/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # SMBUS Library that layers on top of the SMBUS Protocol.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  SmbusLib.c
  DxeSmbusLib.c
  InternalSmbusLib.h
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # Module entry point library for PEI core.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeiCoreEntryPoint.c


--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
+++ b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # Instance of Post Code Library based on Report Status Code Libray.
 #
 # Post Code Library that layers on top of a Report Status Code Libray instance.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PostCode.c

 [Packages]
@@ -39,6 +39,6 @@
  PcdLib
  ReportStatusCodeLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask     ## CONSUMES

--- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # Instance of ExtractGuidedSection Library for PEI phase.
 #
 # This library provides generic extract guided section functions for PEIM and PEI_CORE module.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeiExtractGuidedSectionLib.c

 [Packages]
@@ -42,7 +42,7 @@
  HobLib
  PcdLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler     ## CONSUMES


--- a/MdePkg/Library/PeiHobLib/PeiHobLib.inf
+++ b/MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # Instance of HOB Library using PEI Services.
 #
 # HOB Library implementation that uses PEI Services to retrieve the HOB List.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  HobLib.c


--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
+++ b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of I/O Library using CPU I/O PPI.
 #
 # I/O Library implementation that uses the CPU I/O PPI for I/O
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
+++ b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Memory Allocation Library using PEI Services.
 #
 # Memory Allocation Library that uses PEI Services to allocate memory.
 #  Free operations are ignored.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation
+# Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  MemoryAllocationLib.c

 [Packages]
--- a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
+++ b/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Base Memory Library using PEI Services.
 #
 # Base Memory Library implementation that uses PEI Services
 #  where possible for size reduction.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  ScanMem64Wrapper.c
  ScanMem32Wrapper.c
  ScanMem16Wrapper.c
--- a/MdePkg/Library/PeiPalLib/PeiPalLib.inf
+++ b/MdePkg/Library/PeiPalLib/PeiPalLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of PAL Library using a PPI for PAL entrypoint .
 #
 # Instance of PAL Library that uses a PPI to retrieve the PAL
 # Entry Point and layers on top of AsmPalCall() in the Base Library
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IPF
 #

-[Sources.common]
+[Sources]
  PeiPalLib.c


--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of PCD Library using PCD PPI.
 #
 # There are two PCD PPIs as follows:
@@ -15,7 +15,7 @@
 #
 # PCD Library that uses the PCD PPI to access Dynamic and DynamicEx PCD entries
 #
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -25,7 +25,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -40,7 +40,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeiPcdLib.c


--- a/MdePkg/Library/PeiPciLibPciCfg2/PeiPciLibPciCfg2.inf
+++ b/MdePkg/Library/PeiPciLibPciCfg2/PeiPciLibPciCfg2.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # PCI Library that layers on top of the PCI CFG2 PPI.
 #
 # This library produces the APIs from the PCI Library and implements
@@ -34,7 +34,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PciLib.c


--- a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PeiPciSegmentLibPciCfg2.inf
+++ b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PeiPciSegmentLibPciCfg2.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # PCI Segment Library that layers on top of the PCI CFG2 PPI.
 #
 # This library produces the APIs from the PCI Segment Library and
@@ -34,7 +34,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PciSegmentLib.c

 [Packages]
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
+++ b/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # Instance of Resource Publication Library using PEI Services.
 #
 # Resource Publication Library that uses PEI Services to publish system memory.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation
+# Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeiResourcePublicationLib.c


--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # PEI Services Library implementation.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -26,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeiServicesLib.c


--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
 # Instance of PEI Services Table Pointer Library using global variable for the table pointer.
 #
 # PEI Services Table Pointer Library implementation that retrieves a pointer to the
 #  PEI Services Table from a global variable. Not available to modules that execute from
 #  read-only memory.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,7 +15,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeiServicesTablePointer.c

 [Packages]
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of PEI Services Table Pointer Library using IDT for the table pointer.
 #
 # PEI Services Table Pointer Library implementation that retrieves a pointer to the PEI
 # Services Table from the IDT on IA-32 and x64.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of PEI Services Table Pointer Library using KR7 for the table pointer.
 #
 # PEI Services Table Pointer Library implementation that retrieves a pointer to the PEI
 # Services Table from KR7 on IPF.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
+++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # SMBUS library that layers on top of the SMBUS PPI.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  SmbusLib.c
  PeiSmbusLib.c
  InternalSmbusLib.h
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # Module entry point library for PEIM.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #

-[Sources.common]
+[Sources]
  PeimEntryPoint.c


--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of Timer Library only using CPU resources.
 #
 # Timer Library that only uses CPU resources to provide calibrated delays
@@ -7,7 +7,7 @@
 #  used by SMM drivers and runtime drivers, ACPI timer is recommended for SMM
 #  drivers and runtime drivers.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,7 +17,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmIoLibSmmCpuIo2.inf
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmIoLibSmmCpuIo2.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Component description file for Cpu Io SMM Io Library.
 #
 # I/O Library implementation that uses the CPU I/O Protocol for I/O
@@ -12,7 +12,7 @@
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/SmmLibNull/SmmLibNull.inf
+++ b/MdePkg/Library/SmmLibNull/SmmLibNull.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # NULL instance of SMM Library.
 #
 #  Copyright (c) 2009 - 2010, Intel Corporation.
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
+++ b/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Memory Allocation Library using SMM Services Table.
 #
 # Memory Allocation Library that uses services from the SMM Services Table to 
 # allocate and free memory.
 #
-# Copyright (c) 2010, Intel Corporation.  All rights reserved. <BR>
+# Copyright (c) 2010 - 2010, Intel Corporation.  All rights reserved. <BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution. The full text of the license may be found at
@@ -12,7 +12,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # PCI Library that layers on top of the SMM PCI Root Bridge I/O Protocol.
 #
 # This library produces the APIs from the PCI Library and implements these APIs
--- a/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
+++ b/MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # SMM Services Table Library.
 #
 # Copyright (c) 2009 - 2010, Intel Corporation.
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+++ b/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # Module entry point library for UEFI Application.
 #
-# Copyright (c) 2007 - 2008, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  ApplicationEntryPoint.c


--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # UEFI Boot Services Table Library implementation.
 # 
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiBootServicesTableLib.c

 [Packages]
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Instance of Debug Library using Console Output Device.
 #
 #  Debug Lib that sends messages to the Console Output Device in the EFI System Table.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #


-[Sources.common]
+[Sources]
  DebugLib.c


@@ -45,7 +45,7 @@
  PrintLib
  UefiBootServicesTableLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel         ## CONSUMES
  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue        ## CONSUMES
  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask            ## CONSUMES
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Instance of Debug Library using the Standard Error Device.
 #
 #  Debug Lib that sends messages to the the Standard Error Device in the EFI System Table.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation.
+#  Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DebugLib.c


@@ -43,7 +43,7 @@
  PrintLib
  UefiBootServicesTableLib

-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel    ## CONSUMES
  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue   ## CONSUMES
  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask       ## CONSUMES
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 # Instance of Device Path Library based on Memory Allocation Library.
 #
 # Device Path Library that layers on top of the Memory Allocation Library.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiDevicePathLib.c


--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Device Path Library based on Device Path Protocol.
 #
 #  Device Path Library that layers on top of the UEFI 2.0 Device Path Protocol.
 #  This library is not available for EFI 1.10 modules.
 #
-#  Copyright (c) 2007 - 2008, Intel Corporation
+#  Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiDevicePathLib.c


--- a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+++ b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # Module entry point library for UEFI driver.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  DriverEntryPoint.c


--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of UEFI Library.
 #
 # The UEFI Library provides functions and macros that simplify the development of 
@@ -7,7 +7,7 @@
 #  EFI Driver Model related protocols, manage Unicode string tables for UEFI Drivers, 
 #  and print messages on the console output and standard error devices.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,7 +17,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -32,7 +32,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiLibPrint.c
  UefiNotTiano.c
  UefiDriverModel.c
@@ -75,10 +75,10 @@
  gEfiDriverDiagnostics2ProtocolGuid| NOT PcdDriverDiagnostics2Disable ## SOMETIMES_CONSUMES (User chooses to produce it)


-[Pcd.common]
+[Pcd]
  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize   ## CONSUMES

-[FeaturePcd.common]
+[FeaturePcd]
  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable    ## CONSUMES
  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable        ## CONSUMES
  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable   ## CONSUMES
--- a/MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+++ b/MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Instance of Memory Allocation Library using EFI Boot Services.
 #
 # Memory Allocation Library that uses EFI Boot Services to allocate
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
--- a/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
+++ b/MdePkg/Library/UefiMemoryLib/UefiMemoryLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Base Memory Library using EFI Boot Services.
 #
 # Base Memory Library implementation that uses EFI Boot Services
 #  where possible for size reduction.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  ScanMem64Wrapper.c
  ScanMem32Wrapper.c
  ScanMem16Wrapper.c
--- a/MdePkg/Library/UefiPalLib/UefiPalLib.inf
+++ b/MdePkg/Library/UefiPalLib/UefiPalLib.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # UEFI Instance of PAL Library Class.
 #
 # This instance of PAL library retrieves the PAL Entry Point from the SAL System Table
--- a/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # PCI Library that layers on top of the PCI Root Bridge I/O Protocol.
 #
 # This library produces the APIs from the PCI Library and implements these APIs
@@ -35,7 +35,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciLib.c


--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # PCI Segment Library that layers on top of the PCI Root Bridge I/O Protocol.
 #
 # This library produces the APIs from the PCI Library and implements these APIs
@@ -36,7 +36,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  PciSegmentLib.h
  PciSegmentLib.c

--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
 # Instance of UEFI Runtime Library.
 #
 # Instance of UEFI Runtime Library, with hooked EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE and
 #  EVT_SIGNAL_EXIT_BOOT_SERVICES event, to provide runtime services.
 # This instance also supports SAL drivers for better performance.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,7 +15,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -33,7 +33,7 @@
 #


-[Sources.common]
+[Sources]
  RuntimeLib.c

 [Packages]
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+++ b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # UEFI Runtime Services Table Library implementation.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiRuntimeServicesTableLib.c


--- a/MdePkg/Library/UefiSalLib/UefiSalLib.inf
+++ b/MdePkg/Library/UefiSalLib/UefiSalLib.inf
@@ -1,4 +1,4 @@
-# @file
+## @file
 # UEFI Instance of SAL Library Class.
 #
 # This instance of SAL library retrieves the SAL Entry Point from the SAL System Table
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Scsi Library.
 #
 # This libarary provides the functions to submit Scsi commands defined
 # in SCSI-2 specification for scsi device.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiScsiLib.c


--- a/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
 # Instance of Usb Library.
 #
 # This library instance provides most usb APIs to support the Hid requests defined in
 # Usb Hid 1.1 spec and the standard requests defined in Usb 1.1 spec.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, Intel Corporation.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##

 [Defines]
  INF_VERSION                    = 0x00010005
@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #

-[Sources.common]
+[Sources]
  UefiUsbLibInternal.h
  Hid.c
  UsbDxeLib.c
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # EFI/PI MdePkg Package
 #
 # Copyright (c) 2007 - 2010, Intel Corporation<BR>
@@ -12,7 +12,7 @@
 #    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#**/
+##

 [Defines]
  PLATFORM_NAME                  = Mde
@@ -24,14 +24,14 @@
  BUILD_TARGETS                  = DEBUG|RELEASE
  SKUID_IDENTIFIER               = DEFAULT

-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE
  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|TRUE

-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000
@@ -70,7 +70,7 @@
 #
 ###################################################################################################

-[Components.common]
+[Components]
  MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
  MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
  MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf