diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i
index 548271aa73..c8a209debc 100644
--- a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i
+++ b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.i
@@ -20,11 +20,6 @@
 #ifndef _IPF_CPU_CORE_
 #define _IPF_CPU_CORE_
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #define  PEI_BSP_STORE_SIZE                     0x4000
 #define  ResetFn                                0x00
 #define  MachineCheckFn                         0x01
diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s
index b66192eeb4..b1b5e2a2fe 100644
--- a/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s
+++ b/MdeModulePkg/Core/Pei/Ipf/IpfCpuCore.s
@@ -1,8 +1,3 @@
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 //++
 // Copyright (c) 2006, Intel Corporation
 // All rights reserved. This program and the accompanying materials
diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h b/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
index e2df07378e..f3d1ff503f 100644
--- a/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
+++ b/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
@@ -25,6 +25,7 @@ Revision History
 #define _IPF_PEI_MAIN_H_
 
 #include <PeiMain.h>
+#include <IndustryStandard/Sal.h>
 
 SAL_RETURN_REGS
 GetHandOffStatus (