diff --git a/fb/fbpict.h b/fb/fbpict.h
index a9873b9f1..93ee9b59d 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -47,13 +47,6 @@ extern _X_EXPORT void
 fbAddTraps(PicturePtr pPicture,
            INT16 xOff, INT16 yOff, int ntrap, xTrap * traps);
 
-extern _X_EXPORT void
-fbTriangles(CARD8 op,
-            PicturePtr pSrc,
-            PicturePtr pDst,
-            PictFormatPtr maskFormat,
-            INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
-
 extern _X_EXPORT void
 fbGlyphs(CARD8 op,
 	 PicturePtr pSrc,
diff --git a/fb/fbpict_priv.h b/fb/fbpict_priv.h
index 17837acf4..afeca00aa 100644
--- a/fb/fbpict_priv.h
+++ b/fb/fbpict_priv.h
@@ -20,4 +20,9 @@ void fbTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
                   PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
                   int ntrap, xTrapezoid *traps);
 
+_X_EXPORT /* only for glamor module, not supposed to be used by external drivers */
+void fbTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+                 PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
+                 int ntris, xTriangle *tris);
+
 #endif /* XORG_FBPICT_PRIV_H */
diff --git a/glamor/glamor_triangles.c b/glamor/glamor_triangles.c
index 88a46c11f..500d37f28 100644
--- a/glamor/glamor_triangles.c
+++ b/glamor/glamor_triangles.c
@@ -25,7 +25,9 @@
  *    Zhigang Gong <zhigang.gong@gmail.com>
  *
  */
+#include <dix-config.h>
 
+#include "fb/fbpict_priv.h"
 #include "glamor_priv.h"
 
 void