diff --git a/glamor/glamor.h b/glamor/glamor.h
index 09828b068b..79d627e323 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 723d1ff25d..2d370c7e38 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