diff --git a/ChangeLog b/ChangeLog
index c11c1ef12..c4eda12c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
+
+	* Xext/shmint.h:
+	Merge from xserver a header for shm's server internal functions, which
+	are called by DDXes.  Desired by XGL, and should be used in other
+	locations, probably.
+
+2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	* hw/Makefile.am:
+	* hw/xgl/.cvsignore:
+	* hw/xgl/Makefile.am:
+	* hw/xgl/egl/.cvsignore:
+	* hw/xgl/egl/Makefile.am:
+	* hw/xgl/egl/evdev.c:
+	* hw/xgl/egl/kinput.c:
+	* hw/xgl/egl/module/.cvsignore:
+	* hw/xgl/egl/module/Makefile.am:
+	* hw/xgl/glx/.cvsignore:
+	* hw/xgl/glx/Makefile.am:
+	* hw/xgl/glx/module/.cvsignore:
+	* hw/xgl/glx/module/Makefile.am:
+	* hw/xgl/glx/xglxinit.c: (InitOutput), (InitInput),
+	(ddxProcessArgument), (ddxInitGlobals):
+	* hw/xgl/glxext/.cvsignore:
+	* hw/xgl/glxext/module/.cvsignore:
+	* hw/xgl/glxext/xglglxext.h:
+	* hw/xgl/xgl.h:
+	* hw/xgl/xglglx.c: (xglLoadGLXModules), (xglUnloadGLXModules):
+	* hw/xgl/xglhash.c: (xglLoadHashFuncs):
+	* hw/xgl/xglinit.c: (xglEnsureDDXModule), (ddxInitGlobals):
+	* hw/xgl/xglloader.c: (xglLoadModule):
+	* hw/xgl/xglmodule.h:
+	* include/.cvsignore:
+	* include/xgl-config.h.in:
+	Initial commit of XGL build infrastructure and XGL code changes for
+	building within the xorg server tree.  Requires additional, uncommitted
+	dix changes to successfully build, and successful running is still yet
+	to happen.
+
 2005-12-27  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/kdrive/Imakefile:
diff --git a/Xext/shmint.h b/Xext/shmint.h
new file mode 100644
index 000000000..5135d1729
--- /dev/null
+++ b/Xext/shmint.h
@@ -0,0 +1,44 @@
+/*
+ * $Id$
+ *
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _SHMINT_H_
+#define _SHMINT_H_
+
+#define _XSHM_SERVER_
+#include <X11/extensions/shmstr.h>
+
+#include "screenint.h"
+#include "pixmap.h"
+#include "gc.h"
+
+void
+ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+
+void
+ShmSetPixmapFormat(ScreenPtr pScreen, int format);
+
+void
+ShmRegisterFbFuncs(ScreenPtr pScreen);
+
+#endif /* _SHMINT_H_ */