diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index e7540b7f17..3965c5064a 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -41,9 +41,6 @@
     <MsaFile>
       <Filename>Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa</Filename>
     </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/PcdEmulator/PcdEmulator.msa</Filename>
-    </MsaFile>
     <MsaFile>
       <Filename>Dxe/PlatformBds/PlatformBds.msa</Filename>
     </MsaFile>
@@ -113,9 +110,6 @@
     <MsaFile>
       <Filename>Pei/MonoStatusCode/Nt32/MonoStatusCode.msa</Filename>
     </MsaFile>
-    <MsaFile>
-      <Filename>Pei/PcdEmulator/PcdEmulator.msa</Filename>
-    </MsaFile>
     <MsaFile>
       <Filename>Pei/WinNtStuff/WinNtStuff.msa</Filename>
     </MsaFile>
diff --git a/MdePkg/Include/Common/Pcd.h b/MdePkg/Include/Common/Pcd.h
deleted file mode 100644
index 6f34c74982..0000000000
--- a/MdePkg/Include/Common/Pcd.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file
-  This file defines the common macro and data structure shared between PCD PEIM and
-  PCD DXE driver.
-
-  Copyright (c) 2006, 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
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  Module Name:  Pcd.h
-
-**/
-#ifndef _COMMON_PCD_H
-#define _COMMON_PCD_H
-
-typedef UINT32  PCD_TOKEN_NUMBER;
-typedef UINT8   SKU_ID;
-
-#define PCD_INVALID_TOKEN_NUMBER     ((PCD_TOKEN_NUMBER)(-1))
-
-#endif