diff --git a/MdePkg/Include/Pi/PiBootMode.h b/MdePkg/Include/Pi/PiBootMode.h
index f3fac068cd..474e09dc1d 100644
--- a/MdePkg/Include/Pi/PiBootMode.h
+++ b/MdePkg/Include/Pi/PiBootMode.h
@@ -18,6 +18,8 @@
 #ifndef __PI_BOOT_MODE_H__
 #define __PI_BOOT_MODE_H__
 
+#include <ProcessorBind.h>
+
 typedef UINT32  EFI_BOOT_MODE;
 
 //
diff --git a/MdePkg/Include/Pi/PiFirmwareFile.h b/MdePkg/Include/Pi/PiFirmwareFile.h
index f0dc1a69de..f8abcc78c0 100644
--- a/MdePkg/Include/Pi/PiFirmwareFile.h
+++ b/MdePkg/Include/Pi/PiFirmwareFile.h
@@ -15,9 +15,12 @@
 
 **/
 
+
 #ifndef __PI_FIRMWARE_FILE_H__
 #define __PI_FIRMWARE_FILE_H__
 
+#include <ProcessorBind.h>
+
 #pragma pack(1)
 //
 // Used to verify the integrity of the file.
diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index 7675df016c..68d721d1b1 100644
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -18,6 +18,8 @@
 #ifndef __PI_FIRMWAREVOLUME_H__
 #define __PI_FIRMWAREVOLUME_H__
 
+#include <ProcessorBind.h>
+
 //
 // EFI_FV_FILE_ATTRIBUTES
 //
@@ -90,9 +92,9 @@ typedef struct {
   UINT32 Length;
 } EFI_FV_BLOCK_MAP_ENTRY;
 
-//
-// Describes the features and layout of the firmware volume.
-//
+///
+/// Describes the features and layout of the firmware volume.
+///
 typedef struct {
   UINT8                     ZeroVector[16];
   EFI_GUID                  FileSystemGuid;
diff --git a/MdePkg/Include/Pi/PiHob.h b/MdePkg/Include/Pi/PiHob.h
index 95de43f02f..f7a0ba0166 100644
--- a/MdePkg/Include/Pi/PiHob.h
+++ b/MdePkg/Include/Pi/PiHob.h
@@ -18,6 +18,11 @@
 #ifndef __PI_HOB_H__
 #define __PI_HOB_H__
 
+#include <ProcessorBind.h>
+#include <Pi/PiBootMode.h>
+#include <Uefi/UefiBaseType.h>
+#include <Uefi/UefiMultiPhase.h>
+
 //
 // HobType of EFI_HOB_GENERIC_HEADER.
 // 
diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index 6d54aa222b..e4a8d846d4 100644
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -15,6 +15,8 @@
 #ifndef __UEFI_MULTIPHASE_H__
 #define __UEFI_MULTIPHASE_H__
 
+#include <ProcessorBind.h>
+
 //
 // Enumeration of memory types introduced in UEFI.
 //