diff --git a/configure.in b/configure.in
index 5bde3874..8dbe4e78 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,6 @@ AC_PATH_XTRA
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$X_CFLAGS $CPPFLAGS"
 AC_CHECK_HEADERS([X11/extensions/XTest.h])
-AC_CHECK_HEADERS([X11/XF86keysym.h])
 
 AC_CHECK_LIB(Xinerama, XineramaQueryExtension, AC_CHECK_HEADERS([X11/extensions/Xinerama.h]) [X_LIBS="$X_LIBS -lXinerama"], , [$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
 CPPFLAGS="$save_CPPFLAGS"
diff --git a/lib/platform/CXWindowsKeyMapper.cpp b/lib/platform/CXWindowsKeyMapper.cpp
index 948f1e26..35526a05 100644
--- a/lib/platform/CXWindowsKeyMapper.cpp
+++ b/lib/platform/CXWindowsKeyMapper.cpp
@@ -23,15 +23,71 @@
 #	define XK_MISCELLANY
 #	define XK_XKB_KEYS
 #	include <X11/keysymdef.h>
-#	if defined(HAVE_X11_XF86KEYSYM_H)
-#		include <X11/XF86keysym.h>
-#	endif
-#	if !defined(XF86XK_Launch0)
-#		define XF86XK_Launch0 0x1008FF40
-#	endif
-#	if !defined(XF86XK_Launch1)
-#		define XF86XK_Launch1 0x1008FF41
-#	endif
+// these should be in XF86keysym.h but there are several versions of
+// that file floating around and not all have all symbols and none of
+// them provide any form of versioning so we just define 'em here.
+#define XF86XK_Standby		0x1008FF10
+#define XF86XK_AudioLowerVolume	0x1008FF11
+#define XF86XK_AudioMute	0x1008FF12
+#define XF86XK_AudioRaiseVolume	0x1008FF13
+#define XF86XK_AudioPlay	0x1008FF14
+#define XF86XK_AudioStop	0x1008FF15
+#define XF86XK_AudioPrev	0x1008FF16
+#define XF86XK_AudioNext	0x1008FF17
+#define XF86XK_HomePage		0x1008FF18
+#define XF86XK_Mail		0x1008FF19
+#define XF86XK_Start		0x1008FF1A
+#define XF86XK_Search		0x1008FF1B
+#define XF86XK_AudioRecord	0x1008FF1C
+#define XF86XK_Calculator	0x1008FF1D
+#define XF86XK_Memo		0x1008FF1E
+#define XF86XK_ToDoList		0x1008FF1F
+#define XF86XK_Calendar		0x1008FF20
+#define XF86XK_PowerDown	0x1008FF21
+#define XF86XK_ContrastAdjust	0x1008FF22
+#define XF86XK_RockerUp		0x1008FF23
+#define XF86XK_RockerDown	0x1008FF24
+#define XF86XK_RockerEnter	0x1008FF25
+#define XF86XK_Back		0x1008FF26
+#define XF86XK_Forward		0x1008FF27
+#define XF86XK_Stop		0x1008FF28
+#define XF86XK_Refresh		0x1008FF29
+#define XF86XK_PowerOff		0x1008FF2A
+#define XF86XK_WakeUp		0x1008FF2B
+#define XF86XK_Eject            0x1008FF2C
+#define XF86XK_ScreenSaver      0x1008FF2D
+#define XF86XK_WWW              0x1008FF2E
+#define XF86XK_Sleep            0x1008FF2F
+#define XF86XK_Favorites	0x1008FF30
+#define XF86XK_AudioPause	0x1008FF31
+#define XF86XK_AudioMedia	0x1008FF32
+#define XF86XK_MyComputer	0x1008FF33
+#define XF86XK_VendorHome	0x1008FF34
+#define XF86XK_LightBulb	0x1008FF35
+#define XF86XK_Shop		0x1008FF36
+#define XF86XK_History		0x1008FF37
+#define XF86XK_OpenURL		0x1008FF38
+#define XF86XK_AddFavorite	0x1008FF39
+#define XF86XK_HotLinks		0x1008FF3A
+#define XF86XK_BrightnessAdjust	0x1008FF3B
+#define XF86XK_Finance		0x1008FF3C
+#define XF86XK_Community	0x1008FF3D
+#define XF86XK_Launch0		0x1008FF40
+#define XF86XK_Launch1		0x1008FF41
+#define XF86XK_Launch2		0x1008FF42
+#define XF86XK_Launch3		0x1008FF43
+#define XF86XK_Launch4		0x1008FF44
+#define XF86XK_Launch5		0x1008FF45
+#define XF86XK_Launch6		0x1008FF46
+#define XF86XK_Launch7		0x1008FF47
+#define XF86XK_Launch8		0x1008FF48
+#define XF86XK_Launch9		0x1008FF49
+#define XF86XK_LaunchA		0x1008FF4A
+#define XF86XK_LaunchB		0x1008FF4B
+#define XF86XK_LaunchC		0x1008FF4C
+#define XF86XK_LaunchD		0x1008FF4D
+#define XF86XK_LaunchE		0x1008FF4E
+#define XF86XK_LaunchF		0x1008FF4F
 #endif
 
 // map special KeyID keys to KeySyms