diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c
index d0d057adc..ebc7178fb 100644
--- a/hw/xfree86/parser/Device.c
+++ b/hw/xfree86/parser/Device.c
@@ -75,7 +75,7 @@ static const xf86ConfigSymTabRec DeviceTab[] = {
     {VIDEORAM, "videoram"},
     {BIOSBASE, "biosbase"},
     {MEMBASE, "membase"},
-    {IOBASE, "iobase"},
+    {XF86_TOKEN_IOBASE, "iobase"},
     {CLOCKCHIP, "clockchip"},
     {CHIPID, "chipid"},
     {CHIPREV, "chiprev"},
@@ -181,7 +181,7 @@ xf86parseDeviceSection(void)
                 Error(NUMBER_MSG, "MemBase");
             ptr->dev_mem_base = xf86_lex_val.num;
             break;
-        case IOBASE:
+        case XF86_TOKEN_IOBASE:
             if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
                 Error(NUMBER_MSG, "IOBase");
             ptr->dev_io_base = xf86_lex_val.num;
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 23c65eb12..75b9e1f8f 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -59,9 +59,6 @@
 #ifndef _xf86_tokens_h
 #define _xf86_tokens_h
 
-/* Undefine symbols that some OSs might define */
-#undef IOBASE
-
 /*
  * Each token should have a unique value regardless of the section
  * it is used in.
@@ -169,7 +166,7 @@ typedef enum {
     CLOCKS,
     VIDEORAM,
     BOARD,
-    IOBASE,
+    XF86_TOKEN_IOBASE,
     RAMDAC,
     DACSPEED,
     BIOSBASE,