diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
index 17f12a75eb..8d15e82841 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
@@ -61,7 +61,7 @@ FRAMEWORK_HII_FORMSET_TEMPLATE FormSetTemplate = {
       sizeof (FRAMEWORK_EFI_IFR_FORM_SET)
     },
     //Guid
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}},
     0,
     0,
     0,
@@ -70,8 +70,10 @@ FRAMEWORK_HII_FORMSET_TEMPLATE FormSetTemplate = {
     0
   },
   {
-    FRAMEWORK_EFI_IFR_END_FORM_SET_OP,
-    sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET)
+    {
+      FRAMEWORK_EFI_IFR_END_FORM_SET_OP,
+      sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET)
+    }
   }
 };
 
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index 91410e8b69..26bd38d5ba 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -18,12 +18,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_HII_THUNK_PRIVATE_DATA *mHiiThunkPrivateData;
 
 EFI_HII_THUNK_PRIVATE_DATA mHiiThunkPrivateDataTempate = {
-  {//Signature
-    EFI_HII_THUNK_DRIVER_DATA_SIGNATURE 
-  },
-  {//Handle
-    (EFI_HANDLE) NULL
-  },
+  //Signature
+  EFI_HII_THUNK_DRIVER_DATA_SIGNATURE 
+  ,
+  //Handle
+  (EFI_HANDLE) NULL
+  ,
   { //Hii
     HiiNewPack,
     HiiRemovePack,
@@ -46,18 +46,18 @@ EFI_HII_THUNK_PRIVATE_DATA mHiiThunkPrivateDataTempate = {
     
     HiiGetKeyboardLayout
   },
-  { //StaticHiiHandle
-    //The FRAMEWORK_EFI_HII_HANDLE starts from 1 
-    // and increase upwords untill reach the value of StaticPureUefiHiiHandle. 
-    // The code will assert to prevent overflow.
-    (FRAMEWORK_EFI_HII_HANDLE) 1 
-  },
-  { //StaticPureUefiHiiHandle
-    //The Static FRAMEWORK_EFI_HII_HANDLE starts from 0xFFFF 
-    // and decrease downwords untill reach the value of StaticHiiHandle. 
-    // The code will assert to prevent overflow.
-    (FRAMEWORK_EFI_HII_HANDLE) 0xFFFF 
-  },
+  //StaticHiiHandle
+  //The FRAMEWORK_EFI_HII_HANDLE starts from 1 
+  // and increase upwords untill reach the value of StaticPureUefiHiiHandle. 
+  // The code will assert to prevent overflow.
+  (FRAMEWORK_EFI_HII_HANDLE) 1 
+  ,
+  //StaticPureUefiHiiHandle
+  //The Static FRAMEWORK_EFI_HII_HANDLE starts from 0xFFFF 
+  // and decrease downwords untill reach the value of StaticHiiHandle. 
+  // The code will assert to prevent overflow.
+  (FRAMEWORK_EFI_HII_HANDLE) 0xFFFF 
+  ,
   {
     NULL, NULL                  //HiiHandleLinkList
   },
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
index 970d789368..847a8fbf57 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
@@ -122,21 +122,6 @@ LibExportPackageLists (
   return Status;
 }
 
-BOOLEAN
-IsOnlyStringPackagesInPackageList (
-  IN CONST EFI_HII_PACKAGE_LIST_HEADER *StringPackageListHeader
-  )
-{
-  EFI_HII_PACKAGE_HEADER *PackageHeader;
-
-  PackageHeader = (EFI_HII_PACKAGE_HEADER *) (StringPackageListHeader + 1);
-
-  while (PackageHeader->Type != EFI_HII_PACKAGE_END) {
-    PackageHeader = (EFI_HII_PACKAGE_HEADER *) (PackageHeader );
-  }
-}
-  
-
 EFI_STATUS
 InsertStringPackagesToIfrPackageList (
   IN CONST EFI_HII_PACKAGE_LIST_HEADER *StringPackageListHeader,