diff --git a/IntelFrameworkPkg/Include/Protocol/FormCallback.h b/IntelFrameworkPkg/Include/Protocol/FormCallback.h
index 74029137cc..9c11bd6098 100644
--- a/IntelFrameworkPkg/Include/Protocol/FormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FormCallback.h
@@ -26,6 +26,8 @@
 
 #include <PiDxe.h>
 
+#include <Protocol/FrameworkHii.h>
+
 #define EFI_FORM_CALLBACK_PROTOCOL_GUID \
   { \
     0xf3e4543d, 0xcf35, 0x6cef, {0x35, 0xc4, 0x4f, 0xe6, 0x34, 0x4d, 0xfc, 0x54 } \
@@ -67,6 +69,7 @@ typedef struct {
   //
 } EFI_IFR_DATA_ARRAY;
 
+
 typedef union {
   EFI_IFR_DATA_ARRAY  DataArray;  // Primarily used by those who call back to their drivers and use HII as a repository
   EFI_IFR_PACKET      DataPacket; // Primarily used by those which do not use HII as a repository
diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index ae3d3799d8..7f63d0e5cb 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -414,6 +414,18 @@ typedef struct _EFI_HII_VARIABLE_PACK_LIST {
   EFI_HII_VARIABLE_PACK                *VariablePack;
 } EFI_HII_VARIABLE_PACK_LIST;
 
+typedef struct {
+  EFI_HII_IFR_PACK    *IfrData;
+  EFI_HII_STRING_PACK *StringData;
+} EFI_IFR_PACKET;
+
+typedef struct {
+  UINTN LeftColumn;
+  UINTN RightColumn;
+  UINTN TopRow;
+  UINTN BottomRow;
+} EFI_SCREEN_DESCRIPTOR;
+
 #pragma pack()
 
 /**