diff --git a/cfb/Makefile.am b/cfb/Makefile.am
index 4e249a7ef..1ae63f31f 100644
--- a/cfb/Makefile.am
+++ b/cfb/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = $(CFB_INCLUDES)
 
 EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
              cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \
-	     cfb16.h cfb24.h cfb32.h cfb8bit.h cfbmap.h cfbmskbits.h cfbrrop.h \
-	     cfbtab.h cfbunmap.h
+	     cfb16.h cfb24.h cfb32.h cfb8bit.h cfbrrop.h \
+	     cfbtab.h
 
-sdk_HEADERS = cfb.h
+sdk_HEADERS = cfb.h cfb32.h cfb16.h cfbmap.h cfbunmap.h cfbmskbits.h
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 53b49f9a0..0d5331ebe 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -62,7 +62,8 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
                xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
                xf86cmap.h xf86fbman.h xf86str.h $(XISDKINCS) \
-               $(XVSDKINCS) atKeynames.h xf86Version.h xorgVersion.h
+               $(XVSDKINCS) atKeynames.h xf86Version.h xorgVersion.h \
+               xf86sbusBus.h
 
 DISTCLEANFILES = xf86Build.h
 
@@ -87,7 +88,6 @@ EXTRA_DIST = \
 	xf86cmap.h \
 	xf86fbman.h \
 	xf86pciBus.h \
-	xf86sbusBus.h \
 	xf86str.h \
 	xf86xv.h \
 	xf86xvmc.h \
diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am
index c97821415..dfe6e4f92 100644
--- a/hw/xfree86/xf8_32wid/Makefile.am
+++ b/hw/xfree86/xf8_32wid/Makefile.am
@@ -12,7 +12,7 @@ libxf8_32wid_la_SOURCES = \
 	cfbscrinit.c \
 	cfbwindow.c \
 	cfbwid.c
-	
+
 #libxf8_32wid_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la \
 #                         $(top_builddir)/cfb24/libcfb24.la \
 #                         $(top_builddir)/cfb32/libcfb32.la
diff --git a/mi/Makefile.am b/mi/Makefile.am
index ff1fec605..538cd7da9 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -1,7 +1,8 @@
 noinst_LTLIBRARIES = libminimi.la libmi.la
 
 sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \
-              migc.h mipointrst.h mizerarc.h micoord.h
+              migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
+              mispans.h
 
 AM_CFLAGS = $(DIX_CFLAGS)