diff --git a/glamor/glamor.c b/glamor/glamor.c
index 7eebba39a..d6d6d950a 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -102,7 +102,6 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
     PixmapPtr pixmap;
     GLenum format;
     GLuint tex;
-    glamor_pixmap_private *pixmap_priv;
     enum glamor_pixmap_type type = GLAMOR_GL;
 
     if (w > 32767 || h > 32767)
diff --git a/glamor/glamor.h b/glamor/glamor.h
index 33610a668..c49662e89 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -34,6 +34,7 @@
 #include "gcstruct.h"
 #include "picturestr.h"
 #include "fb.h"
+#include "fbpict.h"
 
 #endif /* GLAMOR_H */