diff --git a/src/backend_evdev.c b/src/backend_evdev.c
index 5fa75fb..20a2ca7 100644
--- a/src/backend_evdev.c
+++ b/src/backend_evdev.c
@@ -29,6 +29,16 @@
 #include "config.h"
 #endif
 
+#include <linux/input.h>
+
+/* workaround for name clash between linux/input.h and xf86str.h */
+#undef BUS_NONE
+#undef BUS_PCI
+#undef BUS_SBUS
+#undef BUS_PLATFORM
+#undef BUS_USB
+#undef BUS_last
+
 #include <xorg-server.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -37,7 +47,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <linux/input.h>
 
 #include <xf86.h>
 #include <xf86_OSproc.h>
diff --git a/src/backend_joystick.c b/src/backend_joystick.c
index b642816..8964d21 100644
--- a/src/backend_joystick.c
+++ b/src/backend_joystick.c
@@ -32,6 +32,16 @@
 #include "config.h"
 #endif
 
+#include <linux/joystick.h>
+
+/* workaround for name clash between joystick.h and xf86str.h */
+#undef BUS_NONE
+#undef BUS_PCI
+#undef BUS_SBUS
+#undef BUS_PLATFORM
+#undef BUS_USB
+#undef BUS_last
+
 #include <xorg-server.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -40,7 +50,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <linux/joystick.h>
 
 #include <xf86.h>
 #include <xf86_OSproc.h>