diff --git a/Xi/extinit.c b/Xi/extinit.c
index 1f7772911..a8f8f1093 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1079,7 +1079,7 @@ IResetProc(ExtensionEntry * unused)
 void
 AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
 {
-    dev->type = type;
+    dev->xinput_type = type;
     dev->name = (char *)xalloc(strlen(name) + 1);
     strcpy(dev->name, name);
 }
diff --git a/Xi/listdev.c b/Xi/listdev.c
index e7d0a9d68..294fec999 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -175,7 +175,7 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes,
     dev = (xDeviceInfoPtr) * buf;
 
     dev->id = d->id;
-    dev->type = d->type;
+    dev->type = d->xinput_type;
     dev->num_classes = num_classes;
     if (d->isMaster && IsKeyboardDevice(d))
 	dev->use = IsXKeyboard;
diff --git a/include/inputstr.h b/include/inputstr.h
index e562c0a13..0a541a714 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -471,7 +471,7 @@ typedef struct _DeviceIntRec {
     Bool        coreEvents;             /* TRUE if device also sends core */
     GrabInfoRec deviceGrab;             /* grab on the device */
     Bool        isMaster;               /* TRUE if device is master */
-    Atom		type;
+    Atom		xinput_type;
     char		*name;
     CARD8		id;
     KeyClassPtr		key;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 3688bfcc0..1d97f9c84 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -6117,7 +6117,7 @@ char *			str;
     if (dev->button)
 	 rep.totalBtns= dev->button->numButtons;
     else rep.totalBtns= 0;
-    rep.devType=	dev->type;
+    rep.devType=	dev->xinput_type;
     rep.hasOwnState=	(dev->key && dev->key->xkbInfo);
     rep.nDeviceLedFBs = 0;
     if (dev->kbdfeed)	rep.dfltKbdFB= dev->kbdfeed->ctrl.id;