diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 8dfd90120..47386d81e 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -7,6 +7,7 @@
 
 #include <X11/fonts/font.h>
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xmd.h>
 
 #include "include/cursor.h"
@@ -54,4 +55,8 @@ int ServerBitsFromGlyph(FontPtr pfont,
                         CursorMetricPtr cm,
                         unsigned char **ppbits);
 
+Bool CursorMetricsFromGlyph(FontPtr pfont,
+                            unsigned ch,
+                            CursorMetricPtr cm);
+
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/include/cursor.h b/include/cursor.h
index 81a3c18d7..f2fa88d16 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,10 +70,6 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-extern _X_EXPORT Bool CursorMetricsFromGlyph(FontPtr /*pfont */ ,
-                                             unsigned /*ch */ ,
-                                             CursorMetricPtr /*cm */ );
-
 extern _X_EXPORT void CheckCursorConfinement(WindowPtr /*pWin */ );
 
 extern _X_EXPORT void NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,