--- a/src/event-unixoid.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/event-unixoid.c	Mon Aug 13 10:28:48 2007 +0200
@@ -37,12 +37,12 @@
 #include "process.h"
 
 #include "sysdep.h"
+#include "sysfile.h"
 #include "sysproc.h"		/* select stuff */
 #include "systime.h"
 
 #ifdef HAVE_GPM
 #include "gpmevent.h"
-#include <gpm.h>
 #endif
 
 /* Mask of bits indicating the descriptors that we wait for input on.
@@ -80,13 +80,13 @@
 {
   unsigned char ch;
   int nread;
-  Lisp_Object console = Qnil;
+  Lisp_Object console;
 
   XSETCONSOLE (console, con);
 
 #ifdef HAVE_GPM
   if (fd == CONSOLE_TTY_MOUSE_FD (con)) {
-    return (handle_gpm_read (event,con,fd));
+    return handle_gpm_read (event,con,fd);
   }
 #endif