--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig	2004-06-20 18:02:36.782820000 -0400
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h	2004-06-20 18:02:53.602820000 -0400
@@ -27,6 +27,7 @@
 
 #if defined(linux)
 #include <asm/types.h>
+#include <linux/fb.h>
 #include <asm/fbio.h>
 #include <asm/openpromio.h>
 #elif defined(SVR4)
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig	2004-07-01 02:04:10.054572233 -0700
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2004-07-01 02:25:45.640719004 -0700
@@ -115,6 +115,8 @@
 #endif /* KDKBDREP */
 }
 
+#undef rate
+
 static int
 KIOCSRATE_ioctl_ok(int rate, int delay) {
 #ifdef KIOCSRATE
@@ -142,8 +144,6 @@
 #endif /* KIOCSRATE */
 }
 
-#undef rate
-
 void xf86SetKbdRepeat(char rad)
 {
 #ifdef __sparc__
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig	2004-07-01 02:04:16.283967799 -0700
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004-07-01 02:26:03.225832036 -0700
@@ -143,6 +143,8 @@
 #endif /* KDKBDREP */
 }
 
+#undef rate
+
 static int
 KIOCSRATE_ioctl_ok(int rate, int delay) {
 #ifdef KIOCSRATE
@@ -170,8 +172,6 @@
 #endif /* KIOCSRATE */
 }
 
-#undef rate
-
 static void
 SetKbdRepeat(InputInfoPtr pInfo, char rad)
 {