diff --git a/Include/Win32/Cxbx/Wnd.h b/Include/Win32/Cxbx/Wnd.h
index 01ff116d5..012c9d239 100644
--- a/Include/Win32/Cxbx/Wnd.h
+++ b/Include/Win32/Cxbx/Wnd.h
@@ -34,6 +34,8 @@
 #ifndef WND_H
 #define WND_H
 
+// this macro will cause warnings if not undef'd
+#undef FIELD_OFFSET
 #include <windows.h>
 
 // ******************************************************************
diff --git a/Source/Win32/Cxbx/EmuExe.cpp b/Source/Win32/Cxbx/EmuExe.cpp
index 74ea219dc..3e42dacc5 100644
--- a/Source/Win32/Cxbx/EmuExe.cpp
+++ b/Source/Win32/Cxbx/EmuExe.cpp
@@ -37,7 +37,10 @@
 #include "Prolog.h"
 #include "Kernel.h"
 
+// this macro will cause warnings if not undef'd
+#undef FIELD_OFFSET
 #include <windows.h>
+
 #include <memory.h>
 
 // ******************************************************************
diff --git a/Source/Win32/CxbxKrnl/Kernel.cpp b/Source/Win32/CxbxKrnl/Kernel.cpp
index 908898d0f..856cfd93e 100644
--- a/Source/Win32/CxbxKrnl/Kernel.cpp
+++ b/Source/Win32/CxbxKrnl/Kernel.cpp
@@ -52,6 +52,8 @@ namespace xntdll
 // ******************************************************************
 namespace win32
 {
+    // this macro will cause warnings if not undef'd
+    #undef FIELD_OFFSET
     #include <windows.h>
 };