diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index 59ee9fb102..c07ee66eb2 100644
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -1,9 +1,8 @@
-
+  
 #ifndef _DUET_DXEIPL_H_
 #define _DUET_DXEIPL_H_
 
-#include "FrameworkPei.h"
-#include "FrameworkModulePei.h"
+#include <FrameworkPei.h>
 
 #include "EfiLdrHandoff.h"
 #include "EfiFlashMap.h"
@@ -19,6 +18,7 @@
 #include <Guid/FlashMapHob.h>
 #include <Guid/SystemNvDataGuid.h>
 #include <Guid/VariableFormat.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 
 #include <Protocol/Decompress.h>
 #include <Protocol/StatusCode.h>
diff --git a/DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/ReportStatusCodeLibInternal.h b/DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/ReportStatusCodeLibInternal.h
index 40c41570d1..7b737630e7 100644
--- a/DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/ReportStatusCodeLibInternal.h
+++ b/DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/ReportStatusCodeLibInternal.h
@@ -29,9 +29,6 @@
 #include <Guid/StatusCodeDataTypeDebug.h>
 #include <Protocol/StatusCode.h>
 
-#include <FrameworkModuleBase.h>
-
-
 /**
   Internal worker function that reports a status code through the Status Code Protocol