4 files changed, 4 insertions, 6 deletions
diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 97d42237b7..d0d9147f02 100644
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -18,7 +18,6 @@
 // The package level header files this module uses
 //
 #include <FrameworkDxe.h>
-#include <FrameworkModuleDxe.h>
 #include <WinNtDxe.h>
 
 //
@@ -26,6 +25,7 @@
 //
 #include <Protocol/WinNtThunk.h>
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 //
 // The Library classes this module consumes
 //
diff --git a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
index ef46107742..23c19017df 100644
--- a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
+++ b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
@@ -25,7 +25,6 @@ Abstract:
 // The package level header files this module uses
 //
 #include <FrameworkDxe.h>
-#include <FrameworkModuleDxe.h>
 #include <WinNtDxe.h>
 
 //
diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 56d402c84c..bc8db38796 100644
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -17,14 +17,14 @@
 //
 // The package level header files this module uses
 //
-#include <FrameworkPei.h>
-#include <FrameworkModulePei.h>
+#include <PiPei.h>
 #include <WinNtPeim.h>
 
 //
 // The protocols, PPI and GUID defintions for this module
 //
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>
 #include <Ppi/NtThunk.h>
 //
 // The Library classes this module consumes
diff --git a/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c b/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c
index d3ac3ae183..828b494ab9 100644
--- a/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c
+++ b/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c
@@ -24,8 +24,7 @@ Abstract:
 //
 // The package level header files this module uses
 //
-#include <FrameworkPei.h>
-#include <FrameworkModulePei.h>
+#include <PiPei.h>
 #include <WinNtPeim.h>
 
 //