diff --git a/glx/Makefile.am b/glx/Makefile.am
index cb71a3763..0f652356d 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -12,8 +12,7 @@ AM_CFLAGS = \
 	@GLX_DEFINES@ \
 	@GLX_ARCH_DEFINES@
 
-# none yet
-#sdk_HEADERS =
+sdk_HEADERS = vndserver.h
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/hw/xfree86/os-support \
@@ -88,4 +87,7 @@ libglxvnd_la_SOURCES = \
 	vndcmds.c \
 	vndext.c \
 	vndservermapping.c \
+	vndservervendor.h \
 	vndservervendor.c
+
+EXTRA_DIST = vnd_dispatch_stubs.c
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 9aa1eec4f..d927fcd16 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -63,6 +63,10 @@ cat > sdksyms.c << EOF
 # include "panoramiX.h"
 #endif
 
+/* glx/Makefile.am */
+#ifdef GLX
+#include "vndserver.h"
+#endif
 
 /* hw/xfree86/int10/Makefile.am -- module */
 /*