diff --git a/ChangeLog b/ChangeLog
index b302b2f26..b97fe48dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,13 @@
-2005-12-28  Luc Verhaegen  <libv@skynet.be>
+2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
 
-	* configure.ac:
-	* hw/xfree86/common/xf86Config.c: (GenerateDriverlist),
-	(configMonitor), (configExtensions), (xf86HandleConfigFile):
-	* hw/xfree86/common/xf86Mode.c: (xf86ModeStatusToString),
-	(xf86CheckModeForMonitor):
-	* hw/xfree86/common/xf86str.h:
-	* hw/xfree86/utils/Makefile.am:
-	* hw/xfree86/utils/cvt/Makefile.am:
-	* hw/xfree86/utils/cvt/cvt.c: (add), (PrintModeline),
-	(xf86CVTMode), (xf86CVTCheckStandard), (PrintUsage),
-	(PrintComment), (main):
-	* hw/xfree86/utils/cvt/cvt.man.pre:
-	Bug #5153: standalone CVT modeline generator.
-	- add hw/xfree86/utils/cvt/, cvt.c, cvt.man.pre and Makefile.am.   
-	- Adjust configure.ac and hw/xfree86/utils/Makefile.am for cvt. 
-	- Add MonPtr->reducedblanking and Option "ReducedBlanking" to the
-	  Monitor section.
-	- Check for reduced blanking in xf86CheckModeForMonitor and disallow
-	  modes with less than 25% blanking otherwise.
-	- Fix some warnings in hw/xfree86/common/xf86Config.c.
+	* hw/xgl/Makefile.am:
+	* hw/xgl/egl/Makefile.am:
+	* hw/xgl/glx/Makefile.am:
+	* mi/miinitext.c:
+	Add necessary *CONFIG_H declarations and a force-off of XF86* extensions
+	in miinitext in the XGL case.  Prevents mismatched structure sizes on my
+	_XSERVER64 machine.  At this point, with the uncommitted render/ diffs,
+	Xglx starts up but displays badly.
 
 2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
 
diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index b8272d2dd..c1ea814fd 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -18,6 +18,8 @@ SUBDIRS = 		\
 
 AM_CFLAGS = \
 	@SERVER_DEFINES@ \
+	-DHAVE_XGL_CONFIG_H \
+	-DHAVE_DIX_CONFIG_H \
 	$(XGLMODULES_CFLAGS)
 
 noinst_LIBRARIES = libxgl.a
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index bc7f1e3b6..a43bcda6c 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -8,6 +8,8 @@ SUBDIRS =		  \
 
 AM_CFLAGS = \
 	@SERVER_DEFINES@ \
+	-DHAVE_XGL_CONFIG_H \
+	-DHAVE_DIX_CONFIG_H \
 	$(XEGLMODULES_CFLAGS)
 
 noinst_LTLIBRARIES = libxegl.la
diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am
index dfd0d38f0..934efa1fc 100644
--- a/hw/xgl/glx/Makefile.am
+++ b/hw/xgl/glx/Makefile.am
@@ -9,6 +9,8 @@ SUBDIRS =		  \
 AM_CFLAGS = \
 	-I$(srcdir)/.. \
 	@SERVER_DEFINES@ \
+	-DHAVE_XGL_CONFIG_H \
+	-DHAVE_DIX_CONFIG_H \
 	$(XGLXMODULES_CFLAGS)
 
 noinst_LTLIBRARIES = libxglx.la
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 18f3a38ce..44e4508fa 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.26 2005/07/16 03:49:59 kem Exp $ */
+/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.27 2005/12/28 10:02:53 ajax Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
@@ -74,6 +74,14 @@ SOFTWARE.
 #undef XF86VIDMODE
 #endif
 
+#ifdef HAVE_XGL_CONFIG_H
+#include <xgl-config.h>
+#undef XF86MISC
+#undef XFreeXDGA
+#undef XF86DRI
+#undef XF86VIDMODE
+#endif
+
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"