diff --git a/dix/cursor_priv.h b/dix/cursor_priv.h
index d50ac6ac69..c1a0d1759b 100644
--- a/dix/cursor_priv.h
+++ b/dix/cursor_priv.h
@@ -16,6 +16,9 @@
 #include "include/input.h"
 #include "include/window.h"
 
+#define CURSOR_BITS_SIZE (sizeof(CursorBits) + (size_t)dixPrivatesSize(PRIVATE_CURSOR_BITS))
+#define CURSOR_REC_SIZE (sizeof(CursorRec) + (size_t)dixPrivatesSize(PRIVATE_CURSOR))
+
 extern CursorPtr rootCursor;
 
 /* reference counting */
diff --git a/include/cursorstr.h b/include/cursorstr.h
index 638cf4bde4..4597bde4ea 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -67,8 +67,6 @@ typedef struct _CursorBits {
     CARD32 *argb;               /* full-color alpha blended */
 } CursorBits, *CursorBitsPtr;
 
-#define CURSOR_BITS_SIZE (sizeof(CursorBits) + (size_t)dixPrivatesSize(PRIVATE_CURSOR_BITS))
-
 typedef struct _Cursor {
     CursorBitsPtr bits;
     unsigned short foreRed, foreGreen, foreBlue;        /* device-independent color */
@@ -80,8 +78,6 @@ typedef struct _Cursor {
     Atom name;
 } CursorRec;
 
-#define CURSOR_REC_SIZE (sizeof(CursorRec) + (size_t)dixPrivatesSize(PRIVATE_CURSOR))
-
 typedef struct _CursorMetric {
     unsigned short width, height, xhot, yhot;
 } CursorMetricRec;