diff --git a/Nt32Pkg/Include/Common/WinNTInclude.h b/Nt32Pkg/Include/Common/WinNTInclude.h
index 91daac6c3c..3aa02e895e 100644
--- a/Nt32Pkg/Include/Common/WinNTInclude.h
+++ b/Nt32Pkg/Include/Common/WinNTInclude.h
@@ -40,6 +40,7 @@ Abstract:
 #undef UNALIGNED
 #undef CONST
 #undef VOID
+#undef DEBUG_EVENT
 
 #include "windows.h"
 
diff --git a/Nt32Pkg/Include/Protocol/WinNtThunk.h b/Nt32Pkg/Include/Protocol/WinNtThunk.h
index b3e161f7cd..3dec1e807a 100644
--- a/Nt32Pkg/Include/Protocol/WinNtThunk.h
+++ b/Nt32Pkg/Include/Protocol/WinNtThunk.h
@@ -30,6 +30,8 @@ Abstract:
 #ifndef __WIN_NT_THUNK_H__
 #define __WIN_NT_THUNK_H__
 
+#include <Common/WinNtInclude.h>
+
 #define EFI_WIN_NT_THUNK_PROTOCOL_GUID \
   { 0x58c518b1, 0x76f3, 0x11d4, { 0xbc, 0xea, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } }