diff --git a/IntelFrameworkModulePkg/Include/DebugInfo.h b/IntelFrameworkModulePkg/Include/DebugInfo.h
deleted file mode 100644
index 3c2889090a..0000000000
--- a/IntelFrameworkModulePkg/Include/DebugInfo.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/** @file
-  Include file for EFI_DEBUG_INFO
-
-Copyright (c) 2006 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-http://opensource.org/licenses/bsd-license.php                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.  
-
-**/
-
-#ifndef _MAX_BBS_ENTRIES_H_
-#define _MAX_BBS_ENTRIES_H_
-
-#pragma pack(1)
-
-typedef struct {
-  UINT32  ErrorLevel;
-  //
-  // 12 * sizeof (UINT64) Var Arg stack
-  //
-  // ascii DEBUG () Format string
-  //
-} EFI_DEBUG_INFO;
-
-#pragma pack()
-
-
-#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
new file mode 100644
index 0000000000..c9e547312a
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
@@ -0,0 +1,37 @@
+/** @file
+  GUID used to pass DEBUG() macro information through the Status Code Protocol
+  and Status Code PPI
+
+  Copyright (c) 2007, Intel Corporation
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _STATUS_CODE_DATA_TYPE_DEBUG_H_
+#define _STATUS_CODE_DATA_TYPE_DEBUG_H_
+
+//
+// Debug DataType defintions.
+//
+
+#define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \
+  { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } }
+
+typedef struct {
+  UINT32  ErrorLevel;
+  //
+  // 12 * sizeof (UINT64) Var Arg stack
+  //
+  // ascii DEBUG () Format string
+  //
+} EFI_DEBUG_INFO;
+
+extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;
+
+#endif // _STATUS_CODE_DATA_TYPE_DEBUG_H_
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 80c9f4e564..d30400caa5 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -62,6 +62,10 @@
   ## Include/Guid/ShellFile.h
   gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}
 
+  ## GUID used to pass DEBUG() macro information through the Status Code Protocol and Status Code PPI
+  ## Include/Guid/StatusCodeDataTypeDebug.h
+  gEfiStatusCodeDataTypeDebugGuid  = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}
+
 
   ## Guid for EFI_DISK_INFO_PROTOCOL.Interface to specify Usb interface.
   ## Include/Protocol/DiskInfo.h
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;
 
diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
index 7b83b91e19..d0ee4493ed 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
@@ -19,6 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <Guid/DataHubStatusCodeRecord.h>
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 #include <Protocol/DataHub.h>
 #include <Protocol/SimpleTextOut.h>
 
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
index dbf356b53b..d0fdbedb6f 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
@@ -24,6 +24,7 @@
 #include <Guid/MemoryStatusCodeRecord.h>
 #include <Protocol/StatusCode.h>
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 #include <Guid/EventGroup.h>
 
 #include <Library/BaseLib.h>