diff --git a/fb/fb.h b/fb/fb.h
index b4e254325..676379a00 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -75,7 +75,6 @@
 #define FB_STIP_UNIT	(1 << FB_STIP_SHIFT)
 #define FB_STIP_MASK	(FB_STIP_UNIT - 1)
 #define FB_STIP_ALLONES	((FbStip) -1)
-#define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
 #define FbFullMask(n)   ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1))
 
 #if FB_SHIFT == 5
diff --git a/fb/fb_priv.h b/fb/fb_priv.h
index b67d1a064..3fdfdae19 100644
--- a/fb/fb_priv.h
+++ b/fb/fb_priv.h
@@ -10,6 +10,8 @@
 #include "include/scrnintstr.h"
 #include "fb/fb.h"
 
+#define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
+
 #ifdef FB_DEBUG
 
 void fbValidateDrawable(DrawablePtr d);
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 3e459885d..fa9c469c5 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 void
 fbPutImage(DrawablePtr pDrawable,
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index 0b804e557..bb8ad9352 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -22,7 +22,7 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 typedef void (*FbDots) (FbBits * dst,
                         FbStride dstStride,
diff --git a/fb/fbpush.c b/fb/fbpush.c
index fd9641154..4864f95c3 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -22,7 +22,7 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 static void
 fbPushPattern(DrawablePtr pDrawable,