--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -44,13 +44,13 @@
 argmatch.o backupfile.o basename.o dirname.o \
 error.o filemode.o full-write.o getopt.o getopt1.o \
 getversion.o group-member.o idcache.o isdir.o long-options.o makepath.o \
-modechange.o obstack.o safe-read.o safe-stat.o safe-lstat.o savedir.o \
+modechange.o obstack.o safe-read.o savedir.o \
 stripslash.o xgetcwd.o xmalloc.o xstrdup.o userspec.o yesno.o \
 @LIBOBJS@ @ALLOCA@
 
 DISTFILES = Makefile.in backupfile.h getopt.h long-options.h modechange.h \
 fnmatch.h fsusage.h group-member.h makepath.h mountlist.h obstack.h pathmax.h \
-safe-xstat.cin safe-xstat.hin getdate.c posixtm.c error.h $(SOURCES)
+getdate.c posixtm.c error.h $(SOURCES)
 
 all: libfu.a
 
@@ -81,8 +81,7 @@
 mostlyclean: clean
 
 distclean: clean
-	rm -f Makefile *.tab.c tposixtm.c \
-	  safe-stat.c safe-stat.h safe-lstat.c safe-lstat.h
+	rm -f Makefile *.tab.c tposixtm.c
 
 realclean: distclean
 	rm -f TAGS getdate.c posixtm.c
@@ -99,28 +98,6 @@
 	$(AR) cr $@ $(OBJECTS)
 	-$(RANLIB) $@
 
-extract_stat = sed 's/@l@//g; s/@L@//g; /@LSTAT_ONLY@/d'
-extract_lstat = sed 's/@l@/l/g; s/@L@/L/g; s/	*@LSTAT_ONLY@//'
-
-safe-lstat.c: safe-xstat.cin
-	$(extract_lstat) $(srcdir)/safe-xstat.cin > $@-t
-	mv $@-t $@
-
-safe-lstat.h: safe-xstat.hin
-	$(extract_lstat) $(srcdir)/safe-xstat.hin > $@-t
-	mv $@-t $@
-
-safe-stat.c: safe-xstat.cin
-	$(extract_stat) $(srcdir)/safe-xstat.cin > $@-t
-	mv $@-t $@
-
-safe-stat.h: safe-xstat.hin
-	$(extract_stat) $(srcdir)/safe-xstat.hin > $@-t
-	mv $@-t $@
-
-safe-stat.o: safe-stat.h
-safe-lstat.o: safe-lstat.h safe-stat.h
-
 # Since this directory contains two parsers, we have to be careful to avoid
 # running two $(YACC)s during parallel makes.  See below.
 getdate.c: getdate.y
@@ -152,7 +129,6 @@
 modechange.o: modechange.h
 mountlist.o: mountlist.h
 xgetcwd.o: pathmax.h
-euidaccess.o fsusage.o isdir.o makepath.o mkdir.o rename.o: safe-stat.h
 makepath.o: makepath.h
 obstack.o: obstack.h
 group-member.o: group-member.h