diff --git a/fb/fb.h b/fb/fb.h
index f63999baf..03135ce69 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -437,12 +437,6 @@ typedef struct {
  */
 #define FbEvenTile(w)	    ((w) <= FB_UNIT && FbPowerOfTwo(w))
 
-/*
- * fballpriv.c
- */
-extern _X_EXPORT Bool
-fbAllocatePrivates(ScreenPtr pScreen);
-
 /*
  * fbarc.c
  */
diff --git a/fb/fb_priv.h b/fb/fb_priv.h
index 800e796df..fbcc6bd17 100644
--- a/fb/fb_priv.h
+++ b/fb/fb_priv.h
@@ -5,6 +5,9 @@
 #ifndef XORG_FB_PRIV_H
 #define XORG_FB_PRIV_H
 
+#include <X11/Xdefs.h>
+
+#include "include/scrnintstr.h"
 #include "fb/fb.h"
 
 #ifdef FB_DEBUG
@@ -18,4 +21,6 @@ static inline void fbValidateDrawable(DrawablePtr d) {}
 
 #endif /* FB_DEBUG */
 
+Bool fbAllocatePrivates(ScreenPtr pScreen);
+
 #endif /* XORG_FB_PRIV_H */
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index e5f9f80ac..547351797 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -22,7 +22,7 @@
 
 #include <dix-config.h>
 
-#include "fb.h"
+#include "fb/fb_priv.h"
 
 static DevPrivateKeyRec fbScreenPrivateKeyRec;
 DevPrivateKey
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index 220a99511..728c22489 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -22,9 +22,10 @@
 
 #include <dix-config.h>
 
+#include "fb/fb_priv.h"
 #include "os/osdep.h"
 
-#include "fb.h"
+#undef CreateWindow
 
 Bool
 fbCloseScreen(ScreenPtr pScreen)