diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index d5e38d549..8dfd90120 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -5,6 +5,7 @@
 #ifndef _XSERVER_DIX_CURSOR_PRIV_H
 #define _XSERVER_DIX_CURSOR_PRIV_H
 
+#include <X11/fonts/font.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
@@ -48,4 +49,9 @@ int AllocGlyphCursor(Font source,
 
 CursorPtr CreateRootCursor(void);
 
+int ServerBitsFromGlyph(FontPtr pfont,
+                        unsigned int ch,
+                        CursorMetricPtr cm,
+                        unsigned char **ppbits);
+
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c
index 3ff6ae83e..879279269 100644
--- a/dix/glyphcurs.c
+++ b/dix/glyphcurs.c
@@ -48,6 +48,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include "dix/cursor_priv.h"
+
 #include "misc.h"
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
diff --git a/include/cursor.h b/include/cursor.h
index bcd98114c..81a3c18d7 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,11 +70,6 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-extern _X_EXPORT int ServerBitsFromGlyph(FontPtr /*pfont */ ,
-                                         unsigned int /*ch */ ,
-                                         CursorMetricPtr /*cm */ ,
-                                         unsigned char ** /*ppbits */ );
-
 extern _X_EXPORT Bool CursorMetricsFromGlyph(FontPtr /*pfont */ ,
                                              unsigned /*ch */ ,
                                              CursorMetricPtr /*cm */ );