diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 8dfd90120..d5e38d549 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -5,7 +5,6 @@
 #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>
 
@@ -49,9 +48,4 @@ 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 012af910e..6ecc230c3 100644
--- a/dix/glyphcurs.c
+++ b/dix/glyphcurs.c
@@ -46,8 +46,6 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#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 81a3c18d7..bcd98114c 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,6 +70,11 @@ 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 */ );