--- a/src/event-unixoid.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/event-unixoid.c	Mon Aug 13 11:13:30 2007 +0200
@@ -41,10 +41,6 @@
 #include "sysproc.h"		/* select stuff */
 #include "systime.h"
 
-#ifdef HAVE_GPM
-#include "gpmevent.h"
-#endif
-
 /* Mask of bits indicating the descriptors that we wait for input on.
    These work as follows:
 
@@ -75,7 +71,7 @@
 int fake_event_occurred;
 
 int
-read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
+read_event_from_tty_or_stream_desc (Lisp_Event *event,
 				    struct console *con, int fd)
 {
   unsigned char ch;
@@ -84,12 +80,6 @@
 
   XSETCONSOLE (console, con);
 
-#ifdef HAVE_GPM
-  if (fd == CONSOLE_TTY_MOUSE_FD (con)) {
-    return handle_gpm_read (event,con,fd);
-  }
-#endif
-
   nread = read (fd, &ch, 1);
   if (nread <= 0)
     {
@@ -184,7 +174,7 @@
 }
 
 static int
-get_process_infd (struct Lisp_Process *p)
+get_process_infd (Lisp_Process *p)
 {
   Lisp_Object instr, outstr;
   get_process_streams (p, &instr, &outstr);
@@ -193,7 +183,7 @@
 }
 
 int
-event_stream_unixoid_select_process (struct Lisp_Process *proc)
+event_stream_unixoid_select_process (Lisp_Process *proc)
 {
   int infd = get_process_infd (proc);
 
@@ -204,7 +194,7 @@
 }
 
 int
-event_stream_unixoid_unselect_process (struct Lisp_Process *proc)
+event_stream_unixoid_unselect_process (Lisp_Process *proc)
 {
   int infd = get_process_infd (proc);