diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 67114be3bb..5349be8d92 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PCD_DXE_SERVICE_H_
 
 #include <PiDxe.h>
+#include <Guid/PcdDataBaseHobGuid.h>
 #include <Protocol/Pcd.h>
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
@@ -1057,8 +1058,6 @@ SetPtrTypeSize (
   IN    OUT   UINTN             *CurrentSize
   );
 
-extern EFI_GUID gPcdDataBaseHobGuid;
-
 extern PCD_DATABASE * mPcdDatabase;
 
 extern DXE_PCD_DATABASE_INIT gDXEPcdDbInit;
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index ed1a14045c..f76b4a4872 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -18,6 +18,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiPei.h>
 #include <Ppi/ReadOnlyVariable2.h>
 #include <Ppi/Pcd.h>
+#include <Guid/PcdDataBaseHobGuid.h>
+#include <Guid/PcdPeiCallbackFnTableHobGuid.h>
 #include <Library/DebugLib.h>
 #include <Library/PeimEntryPoint.h>
 #include <Library/BaseLib.h>
@@ -1004,10 +1006,6 @@ SetPtrTypeSize (
   IN          PEI_PCD_DATABASE  *Database
   );
 
-extern EFI_GUID gPcdDataBaseHobGuid;
-
-extern EFI_GUID gPcdPeiCallbackFnTableHobGuid;
-
 //
 // The init Database created by PCD Database generation tool
 //