diff --git a/MdePkg/Library/DxePalLib/DxePalLib.inf b/MdePkg/Library/DxePalLib/DxePalLib.inf
index 8ea9a25858..09b1498e80 100644
--- a/MdePkg/Library/DxePalLib/DxePalLib.inf
+++ b/MdePkg/Library/DxePalLib/DxePalLib.inf
@@ -3,7 +3,7 @@
 #
 # This library implements the PAL Library Class for the early dxe drivers that need PAL calls before the 
 # Extended SAL PAL services are available
-# Copyright (c) 2007, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.
 #
 #  This software and associated documentation (if any) is furnished
 #  under a license and may only be used or copied in accordance
@@ -22,7 +22,7 @@
   FILE_GUID                      = B05D4251-5BA5-46f2-A011-46CC46D9A590
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PalCallLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_DRIVER 
+  LIBRARY_CLASS                  = PalCallLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
diff --git a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
index 54bddcb0e6..b019232f69 100644
--- a/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
+++ b/MdePkg/Library/FvbServiceLib/FvbServiceLib.inf
@@ -2,7 +2,7 @@
 # FvbService Library for UEFI drivers
 #
 # This library instance provide sevice functions to access Firmware Volume Block protocol.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2008, 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
@@ -18,9 +18,9 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FvbServiceLib
   FILE_GUID                      = bd4d540e-04b0-4b10-8fd5-4a7bb533cf67
-  MODULE_TYPE                    = DXE_RUNTIME_DRIVER
+  MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = FvbServiceLib|DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION
+  LIBRARY_CLASS                  = FvbServiceLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
index 8707bb6fc1..a003038ca6 100644
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
+++ b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
@@ -2,7 +2,7 @@
 # Post code library based on report status code library
 #
 # PostCode Library for PEIMs and DXE drivers that send PostCode to ReportStatusCode
-# Copyright (c) 2006, Intel Corporation.
+# Copyright (c) 2006 - 2008, 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
@@ -20,7 +20,7 @@
   FILE_GUID                      = e062c52d-78dc-4cc5-b246-b13497a8123c
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PostCodeLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER PEIM PEI_CORE SEC UEFI_APPLICATION UEFI_DRIVER
+  LIBRARY_CLASS                  = PostCodeLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER PEIM PEI_CORE UEFI_APPLICATION UEFI_DRIVER
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
index bf7c1ff692..aee8f20148 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
+++ b/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
@@ -3,7 +3,7 @@
 #
 # I/O Library implementation that uses the CPU I/O PPI for I/O
 #  and MMIO operations.
-# Copyright (c) 2006 - 2007, Intel Corporation.
+# Copyright (c) 2006 - 2008, 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
@@ -21,7 +21,7 @@
   FILE_GUID                      = b2585b69-fb63-4220-844a-8fbea8bf01af
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = IoLib|PEIM PEI_CORE SEC
+  LIBRARY_CLASS                  = IoLib|PEIM PEI_CORE
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
diff --git a/MdePkg/Library/PeiPalLib/PeiPalLib.inf b/MdePkg/Library/PeiPalLib/PeiPalLib.inf
index 08f164cbd4..7ffe83508a 100644
--- a/MdePkg/Library/PeiPalLib/PeiPalLib.inf
+++ b/MdePkg/Library/PeiPalLib/PeiPalLib.inf
@@ -22,7 +22,7 @@
   FILE_GUID                      = B53DC524-6B98-4584-940B-8F1363DEF09E
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PalCallLib|PEI_CORE PEIM SEC
+  LIBRARY_CLASS                  = PalCallLib|PEIM PEI_CORE
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000