diff --git a/include/Makefile.am b/include/Makefile.am
index 7e495ffbc..c7b02c7f5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -35,9 +35,14 @@ foo_DATA =					\
 	xdbm.h					\
 	@EXTRA_HDRS@
 
-EXTRA_DATA = err.h fnmatch.h glob.h
+# EXTRA_DATA = err.h
 
-CLEANFILES = $(foo_DATA) asn1.h asn1_err.h hdb_asn1.h hdb_err.h heim_err.h \
+noinst_HEADERS = @NOINST_HDRS@
+
+EXTRA_HEADERS = fnmatch.h glob.h
+
+CLEANFILES = $(foo_DATA) $(noinst_DATA) asn1.h asn1_err.h hdb_asn1.h \
+	hdb_err.h heim_err.h \
 	     krb5_err.h roken.h
 
 krb5-types.h: bits
diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am
index 687e7f586..78d77178b 100644
--- a/lib/kafs/Makefile.am
+++ b/lib/kafs/Makefile.am
@@ -46,7 +46,7 @@ endif # AIX
 lib_LIBRARIES = $(AFSLIBS)
 foodir = $(libdir)
 foo_DATA = $(AFS_EXTRA_LIBS)
-EXTRA_DATA = afslib.so
+# EXTRA_DATA = afslib.so
 
 CLEANFILES= $(AFS_EXTRA_LIBS)