diff --git a/fb/fb.h b/fb/fb.h
index 5bf9d1572..e946ae5d8 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -272,11 +272,6 @@ typedef struct {
     unsigned int dashLength;    /* total of all dash elements */
 } FbGCPrivRec, *FbGCPrivPtr;
 
-#define fbGetGCPrivateKey(pGC)  (&fbGetScreenPrivate((pGC)->pScreen)->gcPrivateKeyRec)
-
-#define fbGetGCPrivate(pGC)	((FbGCPrivPtr)\
-				 dixLookupPrivate(&(pGC)->devPrivates, fbGetGCPrivateKey(pGC)))
-
 #define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 
 #define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)
diff --git a/fb/fb_priv.h b/fb/fb_priv.h
index 22310ec49..bd6e0f6a9 100644
--- a/fb/fb_priv.h
+++ b/fb/fb_priv.h
@@ -12,6 +12,9 @@
 
 #define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
 
+#define fbGetGCPrivateKey(pGC) (&fbGetScreenPrivate((pGC)->pScreen)->gcPrivateKeyRec)
+#define fbGetGCPrivate(pGC) ((FbGCPrivPtr)dixLookupPrivate(&(pGC)->devPrivates, fbGetGCPrivateKey(pGC)))
+
 #ifdef FB_DEBUG
 
 #define FB_HEAD_BITS   (FbStip) (0xbaadf00d)
diff --git a/fb/fbarc.c b/fb/fbarc.c
index 98d4281a7..4cb5cd9e2 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -22,7 +22,8 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
+
 #include "mizerarc.h"
 #include <limits.h>
 
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 737d65816..808bf0918 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -31,7 +31,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb/fb.h"
+#include "fb/fb_priv.h"
 
 #define __FbMaskBits(x,w,l,n,r) { \
     n = (w); \
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 8a834ac3e..8f5b64b38 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 void
 fbCopyNtoN(DrawablePtr pSrcDrawable,
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 28ae748fe..4af8f55f4 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 static const GCFuncs fbGCFuncs = {
     fbValidateGC,
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 5a1282ba9..8d15df3c7 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -23,9 +23,10 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
-#include	<X11/fonts/fontstruct.h>
-#include	"dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+
+#include "fb/fb_priv.h"
+#include "include/dixfontstr.h"
 
 static Bool
 fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height)
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 295486e24..ecd70c782 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include "fb/fb.h"
+#include "fb/fb_priv.h"
 #include "fb/fbbits.h"
 
 #include "miline.h"