5 files changed, 10 insertions, 11 deletions
diff --git a/src/gallium/state_trackers/xlib/Makefile b/src/gallium/state_trackers/xlib/Makefile
index 55e025653da..442d99d638c 100644
--- a/src/gallium/state_trackers/xlib/Makefile
+++ b/src/gallium/state_trackers/xlib/Makefile
@@ -15,7 +15,7 @@ DRIVER_INCLUDES = \
 C_SOURCES = \
 	glxapi.c	\
 	fakeglx.c	\
-	xfonts.c	\
+	fakeglx_fonts.c	\
 	xm_api.c
 
 
diff --git a/src/gallium/state_trackers/xlib/fakeglx.c b/src/gallium/state_trackers/xlib/fakeglx.c
index 7499d0f5046..04ba112b242 100644
--- a/src/gallium/state_trackers/xlib/fakeglx.c
+++ b/src/gallium/state_trackers/xlib/fakeglx.c
@@ -49,7 +49,7 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "version.h"
-#include "xfonts.h"
+#include "fakeglx.h"
 #include "xmesaP.h"
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_public.h"
@@ -3025,9 +3025,6 @@ Fake_glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer)
 }
 
 
-/* silence warning */
-extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
-
 
 /**
  * Create a new GLX API dispatch table with its function pointers
diff --git a/src/gallium/state_trackers/xlib/xfonts.h b/src/gallium/state_trackers/xlib/fakeglx.h
index e36f42f817a..fc75dafc6d8 100644
--- a/src/gallium/state_trackers/xlib/xfonts.h
+++ b/src/gallium/state_trackers/xlib/fakeglx.h
@@ -24,8 +24,9 @@
  */
 
 
-#ifndef XFONTS_H
-#define XFONTS_H
+#ifndef FAKEGLX_H
+#define FAKEGLX_H
+
 
 #ifdef __VMS
 #include <GL/vms_x_fix.h>
@@ -33,6 +34,9 @@
 
 #include <X11/Xlib.h>
 
+struct _glxapi_table;
+
+extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
 
 extern void Fake_glXUseXFont( Font font, int first, int count, int listbase );
 
diff --git a/src/gallium/state_trackers/xlib/xfonts.c b/src/gallium/state_trackers/xlib/fakeglx_fonts.c
index d72c600bd1b..c7f61699e5f 100644
--- a/src/gallium/state_trackers/xlib/xfonts.c
+++ b/src/gallium/state_trackers/xlib/fakeglx_fonts.c
@@ -35,7 +35,7 @@
 #include "glxheader.h"
 #include "context.h"
 #include "imports.h"
-#include "xfonts.h"
+#include "fakeglx.h"
 
 
 /* Some debugging info.  */
diff --git a/src/gallium/state_trackers/xlib/glxapi.c b/src/gallium/state_trackers/xlib/glxapi.c
index 15b80cc7cd0..9336daa0faa 100644
--- a/src/gallium/state_trackers/xlib/glxapi.c
+++ b/src/gallium/state_trackers/xlib/glxapi.c
@@ -37,12 +37,10 @@
 #include "main/glheader.h"
 #include "glapi/glapi.h"
 #include "glxapi.h"
+#include "fakeglx.h"
 #include "pipe/p_thread.h"
 
 
-extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
-
-
 struct display_dispatch {
    Display *Dpy;
    struct _glxapi_table *Table;