1 files changed, 3 insertions, 0 deletions
diff --git a/defines.h b/defines.h
index b5761d66ad..4f31f880d8 100644
--- a/defines.h
+++ b/defines.h
@@ -31,10 +31,13 @@
 #endif /* NeXT */
 
 #ifdef NT
+#define USHORT _USHORT
 #include "win32/win32.h"
+#undef USHORT
 #endif
 
 #if defined __CYGWIN__
+# undef EXTERN
 # if defined USEIMPORTLIB
 #  define EXTERN extern __declspec(dllimport)
 # else