diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 77be5bb0e8..5356e14008 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* gdb_curses.h: Undefine KEY_EVENT before including curses
+	headers.  Move "#undef MOUSE_MOVED" before any curses header
+	inclusion.
+
 2012-05-02  Sergio Durigan Junior  <sergiodj@gmail.com>
 
 	* features/i386/i386-mmx-linux.c: Regenerate.
diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index 787f293c7d..242d6e7d7c 100644
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -20,13 +20,6 @@
 #ifndef GDB_CURSES_H
 #define GDB_CURSES_H 1
 
-#if defined (HAVE_NCURSES_NCURSES_H)
-#include <ncurses/ncurses.h>
-#elif defined (HAVE_NCURSES_H)
-#include <ncurses.h>
-#elif defined (HAVE_CURSESX_H)
-#include <cursesX.h>
-#elif defined (HAVE_CURSES_H)
 #ifdef __MINGW32__
 /* Windows API headers, included e.g. by serial.h, define MOUSE_MOVED,
    and so does PDCurses's curses.h, but for an entirely different
@@ -34,7 +27,18 @@
    anywhere, avoid compiler warnings by undefining MOUSE_MOVED before
    including curses.h.  */
 #undef MOUSE_MOVED
+/* Likewise, KEY_EVENT is defined by ncurses.h, but also by Windows
+   API headers.  */
+#undef KEY_EVENT
 #endif
+
+#if defined (HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
+#elif defined (HAVE_NCURSES_H)
+#include <ncurses.h>
+#elif defined (HAVE_CURSESX_H)
+#include <cursesX.h>
+#elif defined (HAVE_CURSES_H)
 #include <curses.h>
 #endif