diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
index 9db23eb2e5..7996aeb86d 100644
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
@@ -42,6 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PcdLib</Keyword>
+    </LibraryClass>    
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>PciLib.c</Filename>
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
index f567cccc67..7f955ff040 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
@@ -425,13 +425,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
             }
         }
 
-        if(usageInstanceArray.size() != 0) {
-            //
-            // Add "#include 'PcdLib.h'" for Header file
-            //
-            hAutoGenString = "#include <MdePkg/Include/Library/PcdLib.h>\r\n";
-        }
-
         //
         // Generate all PCD entry for a module.
         //