diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c
index 69764f7c6e..d9894c4e6c 100644
--- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c
@@ -22,7 +22,7 @@ Revision History:
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "IfrSupportLibInternal.h"
 
 EFI_STATUS
 EFIAPI
diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c
index ee99bfafe4..e9ab48246c 100644
--- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c
@@ -22,7 +22,7 @@ Revision History:
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "IfrSupportLibInternal.h"
 
 EFI_STATUS
 CreateFormSet (
diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c
index 7bcb453777..05b123887c 100644
--- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c
@@ -23,7 +23,7 @@ Revision History:
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "IfrSupportLibInternal.h"
 
 EFI_STATUS
 CreateSubTitleOpCode (
diff --git a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c
index e48adbd325..04aa4dcd9b 100644
--- a/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c
@@ -20,7 +20,7 @@ Abstract:
 //
 // Include common header file for this module.
 //
-#include "CommonHeader.h"
+#include "IfrSupportLibInternal.h"
 
 VOID
 EfiLibHiiVariablePackGetMap (