diff --git a/hw/xgl/xglgeometry.c b/hw/xgl/xglgeometry.c
index 7c46e31ca8..410c377dee 100644
--- a/hw/xgl/xglgeometry.c
+++ b/hw/xgl/xglgeometry.c
@@ -24,7 +24,7 @@
  */
 
 #include "xgl.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 
 xglDataTypeInfoRec xglGeometryDataTypes[2] = {
diff --git a/hw/xgl/xglsolid.c b/hw/xgl/xglsolid.c
index 789c9dd125..e0cbfc4d84 100644
--- a/hw/xgl/xglsolid.c
+++ b/hw/xgl/xglsolid.c
@@ -25,7 +25,7 @@
 
 #include "xgl.h"
 #include "gcstruct.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 
 Bool