Include keyboard.h before frame.h.

src/w32select.c

@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
 #include "lisp.h"
 #include "w32term.h"	/* for all of the w32 includes */
 #include "dispextern.h"	/* frame.h seems to want this */
+#include "keyboard.h"
 #include "frame.h"	/* Need this to get the X window of selected_frame */
 #include "blockinput.h"
 #include "buffer.h"

src/w32xfns.c

@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <signal.h>
 #include <stdio.h>
 #include "lisp.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "charset.h"
 #include "fontset.h"

src/window.c

@@ -22,13 +22,13 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "commands.h"
 #include "indent.h"
 #include "termchar.h"
 #include "disptab.h"
-#include "keyboard.h"
 #include "dispextern.h"
 #include "blockinput.h"
 #include "intervals.h"