\r
**/\r
\r
-#include <Common/FrameworkDxeCis.h>\r
+//\r
+// The package level header files this module uses\r
+//\r
+#include <FrameworkDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Guid/StatusCodeDataTypeId.h>\r
+#include <Protocol/StatusCode.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/ReportStatusCodeLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
#include <Library/BaseLib.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/PcdLib.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
\r
-#include <Protocol/StatusCode.h>\r
\r
/**\r
Internal worker function that reports a status code through the Status Code Protocol\r