diff --git a/include/ntconf.h b/include/ntconf.h
index 73d421fd8..bf98fec65 100644
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -94,6 +94,15 @@ extern void FDECL(interject, (int));
  *===============================================
  */
 
+#ifdef __MINGW32__
+#ifdef strncasecmp
+#undef strncasecmp
+#endif
+#ifdef strcasecmp
+#undef strcasecmp
+#endif
+#endif
+ 
 #ifdef _MSC_VER
 #if (_MSC_VER > 1000)
 /* Visual C 8 warning elimination */
diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c
index 579125867..b71133af2 100644
--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -1889,7 +1889,7 @@ void nethack_enter_nttty()
             error("Unable to load nhraykey.dll");
     }
 }
-#endif TTY_GRAPHICS
+#endif /* TTY_GRAPHICS */
 
 /* this is used as a printf() replacement when the window
  * system isn't initialized yet
diff --git a/sys/winnt/stubs.c b/sys/winnt/stubs.c
index bb5ad82e4..123ae3b72 100644
--- a/sys/winnt/stubs.c
+++ b/sys/winnt/stubs.c
@@ -7,7 +7,7 @@
 
 #ifdef GUISTUB
 #ifdef TTYSTUB
-#error You can't compile this with both GUISTUB and TTYSTUB defined.
+#error You cannot compile this with both GUISTUB and TTYSTUB defined.
 #endif
 
 int GUILaunched;