diff --git a/fb/fbbits.h b/fb/fbbits.h
index 808bf0918..3cfe535a5 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -24,15 +24,10 @@
  * This file defines functions for drawing some primitives using
  * underlying datatypes instead of masks
  */
+#include "fb/fb_priv.h"
 
 #define isClipped(c,ul,lr)  (((c) | ((c) - (ul)) | ((lr) - (c))) & 0x80008000)
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "fb/fb_priv.h"
-
 #define __FbMaskBits(x,w,l,n,r) { \
     n = (w); \
     r = FbRightMask((x)+n); \
diff --git a/fb/fbpict.h b/fb/fbpict.h
index eb627c15f..a35765b9c 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -20,11 +20,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _FBPICT_H_
 #define _FBPICT_H_
 
diff --git a/glamor/glamor.h b/glamor/glamor.h
index 09828b068..79d627e32 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -34,7 +34,6 @@
 #include <gcstruct.h>
 #include <picturestr.h>
 #include <fb.h>
-#include <fbpict.h>
 #ifdef GLAMOR_FOR_XORG
 #include <xf86xv.h>
 #endif
diff --git a/glamor/glamor_addtraps.c b/glamor/glamor_addtraps.c
index 723d1ff25..2d370c7e3 100644
--- a/glamor/glamor_addtraps.c
+++ b/glamor/glamor_addtraps.c
@@ -27,6 +27,8 @@
  */
 #include <dix-config.h>
 
+#include "fb/fbpict.h"
+
 #include "glamor_priv.h"
 
 void