1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c
index 9cd440a85..26a93a8ed 100644
--- a/xorg-server/glx/xfont.c
+++ b/xorg-server/glx/xfont.c
@@ -30,6 +30,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
@@ -151,7 +155,7 @@ int __glXDisp_UseXFont(__GLXclientState *cl, GLbyte *pc)
     xGLXUseXFontReq *req;
     FontPtr pFont;
     GLuint currentListIndex;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     int error;
 
     req = (xGLXUseXFontReq *) pc;