diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 095a70657..5a0c2bad8 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -7,6 +7,8 @@ AM_CFLAGS = $(DIX_CFLAGS) -I@MESA_SOURCE@/include
 
 INCLUDES = -I$(top_srcdir)/GL/include
 
+nodist_libglx_la_SOURCES = indirect_size.c indirect_size.h
+
 libglx_la_SOURCES = \
         g_disptab.c \
         g_disptab.h \
@@ -42,8 +44,6 @@ libglx_la_SOURCES = \
         glxutil.c \
         glxutil.h \
         impsize.h \
-        indirect_size.c \
-        indirect_size.h \
         render2.c \
         render2swap.c \
         renderpix.c \
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index a9dcbe6f0..678b7b68b 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -25,4 +25,5 @@ INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
 
 EXTRA_DIST = \
 	lnx.h \
-	lnx_kbd.h
+	lnx_kbd.h \
+        $(srcdir)/../shared/ia64Pci.h