diff --git a/ChangeLog b/ChangeLog
index 0da55bf59..5b07471a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-02-16  David Reveman  <davidr@novell.com>
+
+	* GL/mesa/tnl/Makefile.am (AM_CFLAGS):
+	* GL/mesa/swrast_setup/Makefile.am (AM_CFLAGS):
+	* GL/mesa/swrast/Makefile.am (AM_CFLAGS):
+	* GL/mesa/shader/slang/Makefile.am (AM_CFLAGS):
+	* GL/mesa/shader/grammar/Makefile.am (AM_CFLAGS):
+	* GL/mesa/shader/Makefile.am (AM_CFLAGS):
+	* GL/mesa/math/Makefile.am (AM_CFLAGS):
+	* GL/mesa/main/Makefile.am (AM_CFLAGS):
+	* GL/mesa/glapi/Makefile.am (AM_CFLAGS):
+	* GL/mesa/array_cache/Makefile.am (AM_CFLAGS):
+	* GL/mesa/X/Makefile.am (AM_CFLAGS):
+	* GL/mesa/Makefile.am (libGLcore_la_CFLAGS):
+	* GL/glx/Makefile.am (AM_CFLAGS): Remove GLX_CFLAGS, add DIX_CFLAGS.
+
+	* configure.ac: Remove GLX_CFLAGS.
+
 2006-02-15  David Reveman  <davidr@novell.com>
 
 	* GL/mesa/tnl/Makefile.am (AM_CFLAGS):
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index ca51a8c2b..cf8b055af 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libglx.la
 AM_CFLAGS = \
 	@DIX_CFLAGS@ \
 	@GL_CFLAGS@ \
-	@GLX_CFLAGS@ \
 	@XLIB_CFLAGS@ \
 	-I@MESA_SOURCE@/include \
 	-I@MESA_SOURCE@/src/mesa/glapi \
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am
index 232d8d686..63842dda3 100644
--- a/GL/mesa/Makefile.am
+++ b/GL/mesa/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
 
 noinst_LTLIBRARIES = libGLcore.la
 
-libGLcore_la_CFLAGS = @GLX_CFLAGS@ -DUSE_MGL_NAMESPACE -UHAVE_CONFIG_H -DGLXEXT \
+libGLcore_la_CFLAGS = @DIX_CFLAGS@ -DUSE_MGL_NAMESPACE -UHAVE_CONFIG_H -DGLXEXT \
 		-DXF86DRI -DGLX_DIRECT_RENDERING -DGLX_USE_DLOPEN -DGLX_USE_MESA
 
 libGLcore_la_SOURCES = dummy.c
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index fb8a59243..49cd753f9 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
 # -DXFree86Server is required because the X11 driver in Mesa thinks that
 # symbol means "being built in the server"
 AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
-            -DXFree86Server -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+            -DXFree86Server -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index fc36f6333..d87a04551 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libac.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index 1271abdae..3ee8cc7ba 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libglapi.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE  @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE  @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index e82e61f38..2ddc87d8f 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmain.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index 1d49a98c1..7604b626f 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmath.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index b2b9b0b2a..acca246cd 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = grammar slang
 
 noinst_LTLIBRARIES = libshader.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index 1e702b4c4..77f97775a 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgrammar.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../../X \
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index a814e62b4..374fadf4d 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libslang.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../grammar \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 5877e1985..ee67503b4 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libswrast.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index b1fff6dcf..4fcb6b4e3 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libss.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index d49ca2e19..0506a0c0a 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libtnl.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @DIX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/configure.ac b/configure.ac
index db0118677..ae5cd3c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,11 +535,6 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	PKG_CHECK_MODULES([XLIB], [x11])
 	AC_SUBST(XLIB_CFLAGS)
 
-	if test "$ac_cv_sizeof_unsigned_long" = 8; then
-		GLX_CFLAGS=-D_XSERVER64
-	fi
-	AC_SUBST(GLX_CFLAGS)
-
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
 	test -d GL || mkdir GL