--- a/src/events.h	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/events.h	Mon Aug 13 10:28:48 2007 +0200
@@ -116,7 +116,7 @@
 
  create_stream_pair_cb  These callbacks are called by process code to
  delete_stream_pair_cb  create and delete a pait of input and output lstreams
-			which are used for subprocess I/O. 
+			which are used for subprocess I/O.
 
  quitp_cb		A handler function called from the `QUIT' macro which
 			should check whether the quit character has been
@@ -315,13 +315,13 @@
   pair cannot be created. The second, USID_DONTHASH, indicates that streams are
   created, but the event stream does not wish to be able to find the process
   by its USID. Specifically, if an event stream implementation never calss
-  get_process_from_usid, this value should always be returned, to prevent 
+  get_process_from_usid, this value should always be returned, to prevent
   accumulating useless information on USID to process relationship.
 */
 
 /* typedef unsigned int USID; in lisp.h */
 #define USID_ERROR ((USID)-1)
-#define USID_DONTHASH ((USID)0)  
+#define USID_DONTHASH ((USID)0)
 
 
 struct Lisp_Event;
@@ -493,19 +493,30 @@
 
 #define EVENT_LIVE_P(a) (EVENT_TYPE (a) != dead_event)
 
-#define CHECK_LIVE_EVENT(x)						\
-  do { CHECK_EVENT (x);							\
-       if (! EVENTP (x)							\
-	   || ! EVENT_LIVE_P (XEVENT (x)))				\
-         dead_wrong_type_argument (Qevent_live_p, (x)); } while (0)
-#define CONCHECK_LIVE_EVENT(x)						\
-  do { CONCHECK_EVENT (x);						\
-       if (! EVENTP (x)							\
-	   || ! EVENT_LIVE_P (XEVENT (x)))				\
-         x = wrong_type_argument (Qevent_live_p, (x)); } while (0)
+#define CHECK_LIVE_EVENT(x) do {			\
+  CHECK_EVENT (x);					\
+  if (! EVENT_LIVE_P (XEVENT (x)))			\
+    dead_wrong_type_argument (Qevent_live_p, (x));	\
+} while (0)
+#define CONCHECK_LIVE_EVENT(x) do {			\
+  CONCHECK_EVENT (x);					\
+  if (! EVENT_LIVE_P (XEVENT (x)))			\
+    x = wrong_type_argument (Qevent_live_p, (x));	\
+} while (0)
 
 
-extern Lisp_Object Qevent_live_p;
+EXFUN (Fcharacter_to_event, 4);
+EXFUN (Fdeallocate_event, 1);
+EXFUN (Fevent_glyph_extent, 1);
+EXFUN (Fevent_modeline_position, 1);
+EXFUN (Fevent_over_modeline_p, 1);
+EXFUN (Fevent_over_toolbar_p, 1);
+EXFUN (Fevent_point, 1);
+EXFUN (Fevent_window, 1);
+EXFUN (Fmake_event, 2);
+
+extern Lisp_Object QKbackspace, QKdelete, QKescape, QKlinefeed, QKreturn;
+extern Lisp_Object QKspace, QKtab, Qmouse_event_p, Vcharacter_set_property;
 
 /* Note: under X Windows, MOD_ALT is generated by the Alt key if there are
    both Alt and Meta keys.  If there are no Meta keys, then Alt generates
@@ -546,7 +557,6 @@
 
 struct console *event_console_or_selected (Lisp_Object event);
 
-int event_stream_event_pending_p (int user);
 void event_stream_next_event (struct Lisp_Event *event);
 void event_stream_handle_magic_event (struct Lisp_Event *event);
 void event_stream_select_console   (struct console *c);
@@ -624,8 +634,6 @@
 
 extern int emacs_is_blocking;
 
-extern Lisp_Object Vcontrolling_terminal;
-
 extern volatile int sigint_happened;
 
 /* Define this if you want the tty event stream to be used when the