diff --git a/fb/fb.h b/fb/fb.h
index e946ae5d8..888a67a63 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -274,8 +274,6 @@ typedef struct {
 
 #define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 
-#define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)
-
 #define fbGetWinPrivateKey(pWin)        (&fbGetScreenPrivate(((DrawablePtr) (pWin))->pScreen)->winPrivateKeyRec)
 
 #define fbGetWindowPixmap(pWin)	((PixmapPtr)\
diff --git a/fb/fb_priv.h b/fb/fb_priv.h
index bd6e0f6a9..2fff708ad 100644
--- a/fb/fb_priv.h
+++ b/fb/fb_priv.h
@@ -15,6 +15,8 @@
 #define fbGetGCPrivateKey(pGC) (&fbGetScreenPrivate((pGC)->pScreen)->gcPrivateKeyRec)
 #define fbGetGCPrivate(pGC) ((FbGCPrivPtr)dixLookupPrivate(&(pGC)->devPrivates, fbGetGCPrivateKey(pGC)))
 
+#define fbGetScreenPixmap(s)    ((PixmapPtr) (s)->devPrivate)
+
 #ifdef FB_DEBUG
 
 #define FB_HEAD_BITS   (FbStip) (0xbaadf00d)
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index ba1c9a090..4e0086d04 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -28,6 +28,7 @@
 #include <xcb/xcb_keysyms.h>
 #include <X11/keysym.h>
 
+#include "fb/fb_priv.h"
 #include "mi/mipointer_priv.h"
 #include "os/client_priv.h"
 #include "os/osdep.h"