diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPei.inf b/IntelFspWrapperPkg/FspInitPei/FspInitPei.inf
index 0efcf5e542..500c9fd238 100644
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPei.inf
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPei.inf
@@ -5,7 +5,7 @@
 # In 2nd entry, it will parse the hoblist from fsp and report them into pei core.
 # including install the memory as required.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -64,18 +64,18 @@
   FspApiLib
 
 [Ppis]
-  gTopOfTemporaryRamPpiGuid
-  gFspInitDonePpiGuid
-  gEfiEndOfPeiSignalPpiGuid
+  gTopOfTemporaryRamPpiGuid             ## PRODUCES
+  gFspInitDonePpiGuid                   ## PRODUCES
+  gEfiEndOfPeiSignalPpiGuid             ## PRODUCES
 
 [FixedPcd]
-  gFspWrapperTokenSpaceGuid.PcdSecCoreMaxPpiSupported
+  gFspWrapperTokenSpaceGuid.PcdSecCoreMaxPpiSupported         ## CONSUMES
 
 [Pcd]
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
-  gFspWrapperTokenSpaceGuid.PcdMaxUpdRegionSize
+  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize       ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase                 ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize                 ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdMaxUpdRegionSize               ## CONSUMES
 
 [Depex]
   gEfiPeiMasterBootModePpiGuid
diff --git a/IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf b/IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
index 5138bb98a0..3b819d9bb9 100644
--- a/IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
+++ b/IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
@@ -3,7 +3,7 @@
 #
 # This driver will register two callbacks to call fsp's notifies.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -45,11 +45,11 @@
   FspApiLib
 
 [Protocols]
-  gEfiPciEnumerationCompleteProtocolGuid
+  gEfiPciEnumerationCompleteProtocolGuid            ## CONSUMES
 
 [Pcd]
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase       ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize       ## CONSUMES
 
 [Depex]
   TRUE
diff --git a/IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf b/IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
index fc221fc856..479a5090cc 100644
--- a/IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
+++ b/IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
@@ -1,7 +1,7 @@
 ## @file
 # This is the first module taking control of the platform upon power-on/reset.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -57,10 +57,10 @@
   PeCoffExtraActionLib
 
 [Ppis]
-  gTopOfTemporaryRamPpiGuid
+  gTopOfTemporaryRamPpiGuid                                 ## CONSUMES
 
 [FixedPcd]
-  gFspWrapperTokenSpaceGuid.PcdSecCoreMaxPpiSupported
+  gFspWrapperTokenSpaceGuid.PcdSecCoreMaxPpiSupported       ## CONSUMES
 
 [Pcd]
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize
+  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize     ## CONSUMES
diff --git a/IntelFspWrapperPkg/IntelFspWrapperPkg.dec b/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
index 85bc978b13..20bc8b71af 100644
--- a/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
+++ b/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
@@ -1,8 +1,7 @@
 ## @file
-#
 # Provides drivers and definitions to support fsp in EDKII bios.
 #
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2015, 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 that accompanies this distribution.
 # The full text of the license may be found at
diff --git a/IntelFspWrapperPkg/IntelFspWrapperPkg.dsc b/IntelFspWrapperPkg/IntelFspWrapperPkg.dsc
index c93512aacb..dbd05a1272 100644
--- a/IntelFspWrapperPkg/IntelFspWrapperPkg.dsc
+++ b/IntelFspWrapperPkg/IntelFspWrapperPkg.dsc
@@ -1,8 +1,7 @@
 ## @file
-#
 # Provides drivers and definitions to support fsp in EDKII bios.
 #
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2015, 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 that accompanies this distribution.
 # The full text of the license may be found at
diff --git a/IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf b/IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf
index 451698d8d0..2608bf1043 100644
--- a/IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf
+++ b/IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Provide FSP API related function.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -63,4 +63,4 @@
 [LibraryClasses]
 
 [Guids]
-  gFspHeaderFileGuid
+  gFspHeaderFileGuid            ## CONSUMES ## GUID
diff --git a/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf b/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
index 68cd9a9a56..56d0f991b2 100644
--- a/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
+++ b/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Sample to provide FSP platform information related function.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -57,5 +57,5 @@
 [LibraryClasses]
 
 [Pcd]
-  gFspWrapperTokenSpaceGuid.PcdTemporaryRamBase
-  gFspWrapperTokenSpaceGuid.PcdTemporaryRamSize
+  gFspWrapperTokenSpaceGuid.PcdTemporaryRamBase     ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdTemporaryRamSize     ## CONSUMES
diff --git a/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/PeiFspHobProcessLibSample.inf b/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/PeiFspHobProcessLibSample.inf
index cbba3d41f6..720d81f4f6 100644
--- a/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/PeiFspHobProcessLibSample.inf
+++ b/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/PeiFspHobProcessLibSample.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Sample to provide FSP hob process related function.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -64,12 +64,12 @@
   PeiServicesTablePointerLib
 
 [Pcd]
-  gFspWrapperTokenSpaceGuid.PcdPeiMinMemSize
-  gFspWrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize
+  gFspWrapperTokenSpaceGuid.PcdPeiMinMemSize              ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize      ## CONSUMES
 
 [Guids]
-  gFspReservedMemoryResourceHobGuid
-  gEfiMemoryTypeInformationGuid
+  gFspReservedMemoryResourceHobGuid                       ## CONSUMES ## HOB
+  gEfiMemoryTypeInformationGuid                           ## CONSUMES ## GUID
 
 [Ppis]
-  gPeiCapsulePpiGuid
+  gPeiCapsulePpiGuid                                      ## CONSUMES
diff --git a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
index 7df2abdeac..df82c649ad 100644
--- a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
+++ b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Sample to provide FSP wrapper platform sec related function.
 #
-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2015, 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
@@ -76,18 +76,18 @@
   LocalApicLib
 
 [Ppis]
-  gEfiSecPlatformInformationPpiGuid
-  gPeiSecPerformancePpiGuid
-  gEfiTemporaryRamSupportPpiGuid
+  gEfiSecPlatformInformationPpiGuid       ## CONSUMES
+  gPeiSecPerformancePpiGuid               ## CONSUMES
+  gEfiTemporaryRamSupportPpiGuid          ## CONSUMES
 
 [Pcd]
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
+  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize         ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase                   ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize                   ## CONSUMES
 
 [FixedPcd]
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize
-  gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize
+  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress         ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize      ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset             ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress            ## CONSUMES
+  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize               ## CONSUMES