diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
index b7b15fe709..44370a5e1c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
@@ -78,6 +78,7 @@ Returns:
 }
 
 
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
 EFI_STATUS
 AddString (
   IN      VOID                *StringBuffer,
@@ -412,6 +413,7 @@ Returns:
   gBS->FreePool (NewBuffer);
   return EFI_SUCCESS;
 }
+#endif
 
 
 EFI_STATUS
@@ -484,6 +486,8 @@ Returns:
   
 --*/
 {
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
+
   EFI_STATUS        Status;
   EFI_HII_PROTOCOL  *Hii;
   UINTN             DataLength;
@@ -624,6 +628,13 @@ Returns:
   gBS->FreePool (OldData);
 
   return EFI_SUCCESS;
+#else
+  //
+  // The implementation will be added later.
+  //
+  ASSERT (FALSE);
+  return EFI_UNSUPPORTED;
+#endif
 }
 
 
@@ -649,6 +660,7 @@ Returns:
 
 --*/
 {
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
   EFI_STATUS        Status;
 
   EFI_HII_HANDLE    *HiiHandleBuffer;
@@ -740,9 +752,16 @@ Returns:
 lbl_exit:
   gBS->FreePool (HiiHandleBuffer);
   return HiiHandle;
+#else
+  //
+  // The implementation will be added later.
+  //
+  ASSERT (FALSE);
+  return (EFI_HII_HANDLE) 0;
+#endif
 }
 
-
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
 EFI_STATUS
 ValidateDataFromHiiHandle (
   IN      EFI_HII_HANDLE      HiiHandle,
@@ -981,6 +1000,7 @@ Returns:
 
   return EFI_SUCCESS;
 }
+#endif
 
 EFI_HII_PACKAGES *
 PreparePackages (
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrLibrary.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrLibrary.h
index a99bfc0e24..4bbb16910d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrLibrary.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrLibrary.h
@@ -61,6 +61,7 @@ Returns:
 --*/
 ;
 
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
 EFI_STATUS
 AddString (
   IN      VOID                *StringBuffer,
@@ -515,6 +516,7 @@ Returns:
 
 --*/
 ;
+#endif
 
 EFI_STATUS
 ExtractDataFromHiiHandle (
@@ -920,6 +922,7 @@ Returns:
 --*/
 ;
 
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
 EFI_STATUS
 ValidateDataFromHiiHandle (
   IN      EFI_HII_HANDLE      HiiHandle,
@@ -948,6 +951,7 @@ Returns:
   EFI_SUCCESS               - Data successfully validated
 --*/
 ;
+#endif
 
 EFI_STATUS
 CreateBannerOpCode (
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOnTheFly.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOnTheFly.c
index 51abde7cf0..9805747784 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOnTheFly.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOnTheFly.c
@@ -21,6 +21,8 @@ Revision History:
 
 #include "IfrLibrary.h"
 
+#ifdef SUPPORT_DEPRECATED_IFRSUPPORTLIB_API
+
 EFI_STATUS
 CreateFormSet (
   IN      CHAR16              *FormSetTitle,
@@ -972,3 +974,6 @@ Returns:
 
   return EFI_SUCCESS;
 }
+
+#endif
+