diff --git a/Xi/exevents.c b/Xi/exevents.c
index a9c2300cc..0c2bc0e0f 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -80,8 +80,6 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include "dix/cursor_priv.h"
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/geproto.h>
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 28bc0a24f..b7c3393d4 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -43,7 +43,6 @@
 
 #include <dix-config.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "mi/mi_priv.h"
diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index 58048aea9..82fb01144 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -71,6 +71,4 @@ void NewCurrentScreen(DeviceIntPtr pDev,
 
 Bool PointerConfinedToScreen(DeviceIntPtr pDev);
 
-void GetSpritePosition(DeviceIntPtr pDev, int *px, int *py);
-
 #endif /* _XSERVER_DIX_CURSOR_PRIV_H */
diff --git a/include/cursor.h b/include/cursor.h
index 7167f4707..9186e3bf2 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,6 +70,10 @@ typedef struct _CursorMetric *CursorMetricPtr;
 extern _X_EXPORT int FreeCursor(void *pCurs,
                                 XID cid);
 
+extern _X_EXPORT void GetSpritePosition(struct _DeviceIntRec * /* pDev */ ,
+                                        int * /*px */ ,
+                                        int * /*py */ );
+
 #ifdef PANORAMIX
 extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev);
 #endif                          /* PANORAMIX */
diff --git a/randr/rrpointer.c b/randr/rrpointer.c
index bd394530a..b301d050d 100644
--- a/randr/rrpointer.c
+++ b/randr/rrpointer.c
@@ -19,9 +19,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
-#include <dix-config.h>
-
-#include "dix/cursor_priv.h"
 
 #include "randrstr.h"
 #include "inputstr.h"
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index aad475e6f..260f453ee 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 
-#include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/dixgrabs_priv.h"
 #include "dix/input_priv.h"