diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index 31643e2f13..fc4ab67f6c 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -1,7 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
 	-I$(top_srcdir)/hw/kdrive/src		\
-	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/layer		\
 	-I$(top_srcdir)/miext/shadow		\
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index 53df4e23bc..cc64b7720e 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/hw/kdrive/src		\
-	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/fb			\
 	-I$(top_srcdir)/miext/layer		\
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index b437463ddd..cfc3777621 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -2,7 +2,6 @@ INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
 	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/layer		\
 	-I$(top_srcdir)/miext/shadow		\
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 44f3701a05..c478dbdcbc 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/shadow		\
 	-I$(top_srcdir)/randr			\
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index ef3bba3d25..641e6a33c3 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -31,7 +31,9 @@
 
 #define XK_PUBLISHING
 #include <X11/keysym.h>
+#if HAVE_X11_XF86KEYSYM_H
 #include <X11/XF86keysym.h>
+#endif
 #include "kkeymap.h"
 #include <signal.h>
 #include <stdio.h>
@@ -513,12 +515,18 @@ const KdKeySymModsRec kdKeySymMods[] = {
   {  XK_Mode_switch, Mod4Mask },
 #ifdef TOUCHSCREEN
   /* PDA specific hacks */
+#ifdef XF86XK_Start
   {  XF86XK_Start, ControlMask },
+#endif
   {  XK_Menu, ShiftMask },
   {  XK_telephone, Mod1Mask },
+#ifdef XF86XK_AudioRecord
   {  XF86XK_AudioRecord, Mod2Mask },
+#endif
+#ifdef XF86XK_Calendar
   {  XF86XK_Calendar, Mod3Mask }
 #endif
+#endif
 };
 
 #define NUM_SYM_MODS (sizeof(kdKeySymMods) / sizeof(kdKeySymMods[0]))
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index 3bd6c039db..2338672a8d 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -1,7 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
 	-I$(top_srcdir)/hw/kdrive/src		\
-	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/layer		\
 	-I$(top_srcdir)/miext/shadow		\