2 files changed, 11 insertions, 7 deletions
diff --git a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
index d2d74336a0..ceb91cf8b9 100644
--- a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
@@ -14,10 +14,16 @@
 
 **/
 
-#ifndef __HII_LIB_H__
-#define __HII_LIB_H__
+#ifndef __FRAMEWORK_HII_LIB_H__
+#define __FRAMEWORK_HII_LIB_H__
+
+#include <FrameworkDxe.h>
 
 #include <Protocol/FrameworkHii.h>
+//
+// FrameworkHiiLib will produce HiiLib library class too.
+//
+#include <Library/HiiLib.h>
 
 /**
   This function allocates pool for an EFI_HII_PACKAGES structure
@@ -41,6 +47,4 @@ PreparePackages (
   )
 ;
 
-
-
 #endif
diff --git a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
index d2a1ff5ee4..2ea9a01028 100644
--- a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
@@ -513,7 +513,7 @@ Returns:
 
 EFI_STATUS
 ExtractDataFromHiiHandle (
-  IN      EFI_HII_HANDLE      HiiHandle,
+  IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,
   IN OUT  UINT16              *ImageLength,
   OUT     UINT8               *DefaultImage,
   OUT     EFI_GUID            *Guid
@@ -547,7 +547,7 @@ Returns:
 --*/
 ;
 
-EFI_HII_HANDLE
+FRAMEWORK_EFI_HII_HANDLE 
 FindHiiHandle (
   IN OUT EFI_HII_PROTOCOL    **HiiProtocol, OPTIONAL
   IN     EFI_GUID            *Guid
@@ -917,7 +917,7 @@ Returns:
 
 EFI_STATUS
 ValidateDataFromHiiHandle (
-  IN      EFI_HII_HANDLE      HiiHandle,
+  IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,
   OUT     BOOLEAN             *Results
   )
 /*++