Include keyboard.h before frame.h.

9 files changed, 14 insertions, 10 deletions

diff --git a/src/alloc.c b/src/alloc.c
index fa6a4c2394c..daadc998cb5 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -36,9 +36,9 @@ Boston, MA 02111-1307, USA.  */
 #include "puresize.h"
 #include "buffer.h"
 #include "window.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "blockinput.h"
-#include "keyboard.h"
 #include "charset.h"
 #include "syssignal.h"
 #include <setjmp.h>
diff --git a/src/buffer.c b/src/buffer.c
index ea4d4699ceb..9e2142b0bfc 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -26,7 +26,9 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/param.h>
 #include <errno.h>
 
+#ifndef USE_CRT_DLL
 extern int errno;
+#endif
 
 #ifndef MAXPATHLEN
 /* in 4.1, param.h fails to define this. */
@@ -45,6 +47,7 @@ extern int errno;
 #include "region-cache.h"
 #include "indent.h"
 #include "blockinput.h"
+#include "keyboard.h"
 #include "frame.h"
 
 struct buffer *current_buffer;		/* the current buffer */
diff --git a/src/fontset.c b/src/fontset.c
index 30450ea8368..7b8f5ce73c9 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "buffer.h"
 #include "charset.h"
 #include "ccl.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "dispextern.h"
 #include "fontset.h"
diff --git a/src/frame.c b/src/frame.c
index efbf7a12259..714aaad9d77 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -29,6 +29,10 @@ Boston, MA 02111-1307, USA.  */
 #ifdef WINDOWSNT
 #include "w32term.h"
 #endif
+#include "buffer.h"
+/* These help us bind and responding to switch-frame events.  */
+#include "commands.h"
+#include "keyboard.h"
 #include "frame.h"
 #ifdef HAVE_WINDOW_SYSTEM
 #include "fontset.h"
@@ -222,12 +226,6 @@ set_menu_bar_lines (f, value, oldval)
     }
 }
 
-#include "buffer.h"
-
-/* These help us bind and responding to switch-frame events.  */
-#include "commands.h"
-#include "keyboard.h"
-
 Lisp_Object Vemacs_iconified;
 Lisp_Object Vframe_list;
 
diff --git a/src/indent.c b/src/indent.c
index b899464496d..7a7be2fe301 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "category.h"
 #include "indent.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "termchar.h"
diff --git a/src/minibuf.c b/src/minibuf.c
index 50cd82ae1af..464dc37093f 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -27,10 +27,10 @@ Boston, MA 02111-1307, USA.  */
 #include "buffer.h"
 #include "charset.h"
 #include "dispextern.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "syntax.h"
-#include "keyboard.h"
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 
diff --git a/src/print.c b/src/print.c
index 85b508a50b4..b6d12f2a9fb 100644
--- a/src/print.c
+++ b/src/print.c
@@ -25,12 +25,12 @@ Boston, MA 02111-1307, USA.  */
 #include "lisp.h"
 #include "buffer.h"
 #include "charset.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "process.h"
 #include "dispextern.h"
 #include "termchar.h"
-#include "keyboard.h"
 #include "intervals.h"
 
 Lisp_Object Vstandard_output, Qstandard_output;
diff --git a/src/scroll.c b/src/scroll.c
index fcb2e0e791a..83e029f417c 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include "termchar.h"
 #include "lisp.h"
 #include "dispextern.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 
diff --git a/src/term.c b/src/term.c
index 01e5b578164..07e633fec62 100644
--- a/src/term.c
+++ b/src/term.c
@@ -31,10 +31,10 @@ Boston, MA 02111-1307, USA.  */
 #include "lisp.h"
 #include "charset.h"
 #include "coding.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "disptab.h"
 #include "termhooks.h"
-#include "keyboard.h"
 #include "dispextern.h"
 #include "window.h"