diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index b13861eecf..95045aa4be 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -41,9 +41,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
index 6e4f9e0e36..09698a4889 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
@@ -31,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PcdLib</Keyword>
-    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>BasePeCoff.c</Filename>
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 4a47a9fb2f..dea679b407 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -78,11 +78,6 @@ public class AutoGen {
     /// 
     private CommonDefinition.PCD_DRIVER_TYPE pcdDriverType;
 
-    ///
-    /// Judge whether this module's library instance use PcdLib library class 
-    /// 
-    private boolean isModuleLibraryInstanceUsePcd;
-
     ///
     /// The protocl list which records in module or library surface area and
     /// it's dependence on library instance surface area.
@@ -328,28 +323,6 @@ public class AutoGen {
         //
         String[] libClassList = SurfaceAreaQuery
                                 .getLibraryClasses(CommonDefinition.AlwaysConsumed,this.arch);
-        boolean  isModuleConsumePcdLib = false;
-        List<String> libClassArray     = new ArrayList<String>();
-        for (int index = 0; index < libClassList.length; index++) {
-            libClassArray.add(libClassList[index]);
-            //
-            // Search all library class of a module for PcdLib
-            // 
-            if (libClassList[index].equalsIgnoreCase(CommonDefinition.pcdLibName)) {
-                isModuleConsumePcdLib = true;
-            }
-        }
-
-        //
-        // If module do not use PCD but module's library use PCD.
-        // 
-        if (!isModuleConsumePcdLib && this.isModuleLibraryInstanceUsePcd) {
-            libClassArray.add(CommonDefinition.pcdLibName);
-        }
-
-        libClassList = new String[libClassArray.size()];
-        libClassArray.toArray(libClassList);
-
         if (libClassList != null) {
             libClassIncludeH = LibraryClassToAutogenH(libClassList);
             item = libClassIncludeH.iterator();
@@ -2085,9 +2058,6 @@ public class AutoGen {
                                                       .getProtocolNotifyArray(this.arch);
                         String[] guidList = SurfaceAreaQuery
                                             .getGuidEntryArray(this.arch);
-                        String[] libraryClassList = SurfaceAreaQuery.getLibraryClasses(
-                                                        CommonDefinition.AlwaysConsumed, 
-                                                        this.arch);
                         PackageIdentification[] pkgList = SurfaceAreaQuery.getDependencePkg(this.arch);
 
                         //
@@ -2119,11 +2089,7 @@ public class AutoGen {
                                 this.mDepPkgList.add(pkgList[index]);
                             }
                         }
-                        for (index = 0; index < libraryClassList.length; index++) {
-                            if (libraryClassList[index].equalsIgnoreCase(CommonDefinition.pcdLibName)) {
-                                this.isModuleLibraryInstanceUsePcd = true;
-                            }
-                        }
+
                         //
                         // If not yet parse this library instance's constructor
                         // element,parse it.
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
index 244f2550b5..a99de4da4f 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
@@ -58,8 +58,6 @@ public class CommonDefinition {
     public final static String tianoR8FlashMapH = "TianoR8FlashMap.h";
     public final static String flashMapH = "FlashMap.h";
 
-    public final static String pcdLibName = "PcdLib";
-
     //
     // The defintions for identifying current module
     // is PEI Pcd driver or Dxe Pcd driver.