diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index a6b235ca64..47b5620b18 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -518,6 +518,9 @@ GetDeviceUse(DeviceIntPtr dev, uint16_t * attachment)
     return use;
 }
 
+static int ListDeviceClasses(ClientPtr client, DeviceIntPtr dev, char *any,
+                             uint16_t * nclasses);
+
 /**
  * Write the info for device dev into the buffer pointed to by info.
  *
@@ -551,7 +554,7 @@ ListDeviceInfo(ClientPtr client, DeviceIntPtr dev, xXIDeviceInfo * info)
  * nclasses to the number of classes in total and return the number of bytes
  * written.
  */
-int
+static int
 ListDeviceClasses(ClientPtr client, DeviceIntPtr dev,
                   char *any, uint16_t * nclasses)
 {
diff --git a/Xi/xiquerydevice.h b/Xi/xiquerydevice.h
index ff66331aa1..a3ecb40644 100644
--- a/Xi/xiquerydevice.h
+++ b/Xi/xiquerydevice.h
@@ -31,8 +31,6 @@
 int SProcXIQueryDevice(ClientPtr client);
 int ProcXIQueryDevice(ClientPtr client);
 int SizeDeviceClasses(DeviceIntPtr dev);
-int ListDeviceClasses(ClientPtr client, DeviceIntPtr dev,
-                      char *any, uint16_t * nclasses);
 int GetDeviceUse(DeviceIntPtr dev, uint16_t * attachment);
 int ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo * info, Bool reportState);
 int ListKeyInfo(DeviceIntPtr dev, xXIKeyInfo * info);