diff --git a/Xext/saver.c b/Xext/saver.c
index 3f0a4613a..fad78f68e 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -36,6 +36,7 @@ in this Software without prior written authorization from the X Consortium.
 #include <X11/extensions/saverproto.h>
 
 #include "dix/colormap_priv.h"
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "miext/extinit_priv.h"
 
diff --git a/dix/cursor.c b/dix/cursor.c
index 94f1c044f..02de4f44d 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -51,6 +51,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "servermd.h"
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index bd685dbe1..3df0d4e50 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -9,4 +9,9 @@
 
 extern CursorPtr rootCursor;
 
+/* reference counting */
+CursorPtr RefCursor(CursorPtr cursor);
+CursorPtr UnrefCursor(CursorPtr cursor);
+int CursorRefCount(const CursorPtr cursor);
+
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/dix/events.c b/dix/events.c
index a59d5a80b..5f65a64e3 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -114,6 +114,7 @@ Equipment Corporation.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/exevents_priv.h"
diff --git a/dix/grabs.c b/dix/grabs.c
index 8cd1900e2..39ab2f9b1 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -53,6 +53,7 @@ SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2.h>
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 #include "os/auth.h"
diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
index d423ad204..880e23b04 100644
--- a/hw/xfree86/ramdac/xf86CursorRD.c
+++ b/hw/xfree86/ramdac/xf86CursorRD.c
@@ -3,6 +3,8 @@
 #include <xorg-config.h>
 #endif
 
+#include "dix/cursor_priv.h"
+
 #include "xf86.h"
 #include "xf86CursorPriv.h"
 #include "colormapst.h"
diff --git a/include/cursor.h b/include/cursor.h
index 74cd16c74..40018e631 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -65,10 +65,6 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
-extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */);
-extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */);
-extern _X_EXPORT int CursorRefCount(const CursorPtr /* cursor */);
-
 extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ ,
                                      unsigned char * /*pmaskbits */ ,
                                      CARD32 * /*argb */ ,
diff --git a/render/animcur.c b/render/animcur.c
index c1d32e9b0..f02383c35 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -37,6 +37,9 @@
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
+
+#include "dix/cursor_priv.h"
+
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 76b96dc6b..353fa28d9 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -46,6 +46,7 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 
 #include "xfixesint.h"