--- hw/xfree86/common/Makefile.am.orig	2009-06-19 21:06:18.000000000 +0200
+++ hw/xfree86/common/Makefile.am	2009-06-19 21:08:00.000000000 +0200
@@ -47,7 +47,7 @@
               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
               xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
               $(XVSDKINCS) xorgVersion.h \
-              xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
+              xf86sbusBus.h xf86xvpriv.h
 
 DISTCLEANFILES = xf86Build.h
 CLEANFILES = $(BUILT_SOURCES)
--- hw/xfree86/parser/Makefile.am.orig	2009-06-19 19:20:14.000000000 +0000
+++ hw/xfree86/parser/Makefile.am	2009-06-19 19:21:53.000000000 +0000
@@ -35,6 +35,4 @@
 	xf86tokens.h
 
 sdk_HEADERS = \
-	$(LIBHEADERS) \
-	xf86Parser.h \
-	xf86Optrec.h
+	$(LIBHEADERS)