diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 4abff0d79..23c65eb12 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -91,11 +91,6 @@ typedef enum {
     OPTION,
     COMMENT,
 
-    /* Frequency units */
-    HRZ,
-    KHZ,
-    MHZ,
-
     /* File tokens */
     FONTPATH,
     MODULEPATH,
@@ -126,9 +121,6 @@ typedef enum {
     GAMMA,
     USEMODES,
 
-    /* Modes tokens */
-    /* no new ones */
-
     /* Mode tokens */
     DOTCLOCK,
     HTIMINGS,
@@ -189,37 +181,6 @@ typedef enum {
     BUSID,
     IRQ,
 
-    /* Keyboard tokens */
-    AUTOREPEAT,
-    XLEDS,
-    KPROTOCOL,
-    XKBKEYMAP,
-    XKBCOMPAT,
-    XKBTYPES,
-    XKBKEYCODES,
-    XKBGEOMETRY,
-    XKBSYMBOLS,
-    XKBDISABLE,
-    PANIX106,
-    XKBRULES,
-    XKBMODEL,
-    XKBLAYOUT,
-    XKBVARIANT,
-    XKBOPTIONS,
-    /* Obsolete keyboard tokens */
-    SERVERNUM,
-    LEFTALT,
-    RIGHTALT,
-    SCROLLLOCK_TOK,
-    RIGHTCTL,
-    /* arguments for the above obsolete tokens */
-    CONF_KM_META,
-    CONF_KM_COMPOSE,
-    CONF_KM_MODESHIFT,
-    CONF_KM_MODELOCK,
-    CONF_KM_SCROLLLOCK,
-    CONF_KM_CONTROL,
-
     /* Pointer tokens */
     EMULATE3,
     BAUDRATE,