diff --git a/ChangeLog b/ChangeLog
index ac740e5a0..316cde742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@
 	* miext/rootless/accel/rlAccel.c:
 	Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
 
+	* Xprint/ps/Makefile.am:
+	* Xprint/raster/Makefile.am:
+	Remove stray mfb/cfb references.
+
 2006-04-27  Eric Anholt  <anholt@FreeBSD.org>
 
 	* exa/exa_accel.c: (exaPolyPoint), (exaPolylines),
diff --git a/Xprint/ps/Makefile.am b/Xprint/ps/Makefile.am
index ecd7137b4..a05734d5f 100644
--- a/Xprint/ps/Makefile.am
+++ b/Xprint/ps/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libps.la
 
-INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+INCLUDES = -I$(top_srcdir)/Xprint
 
 AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \
 	-D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
diff --git a/Xprint/raster/Makefile.am b/Xprint/raster/Makefile.am
index fe14a0780..4a2223115 100644
--- a/Xprint/raster/Makefile.am
+++ b/Xprint/raster/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libraster.la
 
-INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+INCLUDES = -I$(top_srcdir)/Xprint
 
 AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 	-D_XP_PRINT_SERVER_ -DPSZ=8