4 files changed, 4 insertions, 6 deletions
diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 5229061ff2..7e6e7ba2ae 100644
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -27,10 +27,10 @@
 #include <Library/DevicePathLib.h>
 
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 #include <Protocol/StatusCode.h>
 
 #include <FrameworkModuleBase.h>
-#include <DebugInfo.h>
 
 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;
 
diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 3c9e03527f..fd77f7f904 100644
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -17,6 +17,7 @@
 #include <FrameworkPei.h>
 #include <FrameworkModuleBase.h>
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
@@ -24,8 +25,6 @@
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/PcdLib.h>
 
-#include <DebugInfo.h>
-
 /**
 
   Prints a debug message to the debug output device if the specified error level is enabled.
diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index 9bd3109121..de1ee10936 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -16,6 +16,7 @@
 #include <FrameworkPei.h>
 
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/DebugLib.h>
@@ -25,8 +26,6 @@
 #include <Library/OemHookStatusCodeLib.h>
 #include <Library/PcdLib.h>
 
-#include <DebugInfo.h>
-
 //
 // Define the maximum extended data size that is supported in the PEI phase
 //
diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 35d5faedd1..7708fc4cec 100644
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -27,11 +27,11 @@
 #include <Library/DevicePathLib.h>
 
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 #include <Guid/EventGroup.h>
 #include <Protocol/StatusCode.h>
 
 #include <FrameworkModuleBase.h>
-#include <DebugInfo.h>
 
 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;