diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index 9f558168cd..9d5b81604d 100644
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -109,7 +109,12 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];
 } EFI_FIRMWARE_VOLUME_HEADER;
 
+#define EFI_FVH_SIGNATURE EFI_SIGNATURE_32 ('_', 'F', 'V', 'H')
 
+///
+/// Firmware Volume Header Revision definition
+///
+#define EFI_FVH_REVISION  0x01
 
 //
 // Extension header pointed by ExtHeaderOffset of volume header.
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
index 223ad40f9d..84fc1dc3af 100644
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
@@ -20,6 +20,11 @@ Abstract:
 #ifndef __RUNTIMELIBINTERNAL_H__
 #define __RUNTIMELIBINTERNAL_H__
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 extern EFI_RUNTIME_SERVICES   *mRT;
 
 #endif //__RUNTIMELIBINTERNAL_H__
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index af25c9267b..02e857dc58 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -117,6 +117,7 @@
   ${WORKSPACE}\MdePkg\Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   ${WORKSPACE}\MdePkg\Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
   ${WORKSPACE}\MdePkg\Library/UefiLib/UefiLib.inf
+  ${WORKSPACE}\MdePkg\Library/UefiRuntimeLib/UefiRuntimeLib.inf
   ${WORKSPACE}\MdePkg\Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf