diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dc96e0a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*~
+configure
+patch-backlog
diff --git a/autoconf/make/depend.mk~ b/autoconf/make/depend.mk~
deleted file mode 100644
index 69c1272..0000000
--- a/autoconf/make/depend.mk~
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Dependencies.
-#
-
-src/library/getopt.d src/library/getopt.o: src/library/getopt.c src/include/config.h src/include/library/gettext.h 
-src/library/gettext.d src/library/gettext.o: src/library/gettext.c src/include/config.h src/include/library/gettext.h 
-src/main/debug.d src/main/debug.o: src/main/debug.c src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/main/help.d src/main/help.o: src/main/help.c src/include/config.h src/include/library/gettext.h 
-src/main/main.d src/main/main.o: src/main/main.c src/include/config.h src/include/library/gettext.h src/include/options.h src/include/pv.h 
-src/main/options.d src/main/options.o: src/main/options.c src/include/config.h src/include/library/gettext.h src/include/options.h src/include/library/getopt.h src/include/pv.h 
-src/main/remote.d src/main/remote.o: src/main/remote.c src/include/config.h src/include/library/gettext.h src/include/options.h src/include/pv.h 
-src/main/version.d src/main/version.o: src/main/version.c src/include/config.h src/include/library/gettext.h 
-src/pv/cursor.d src/pv/cursor.o: src/pv/cursor.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/display.d src/pv/display.o: src/pv/display.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/file.d src/pv/file.o: src/pv/file.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/loop.d src/pv/loop.o: src/pv/loop.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/number.d src/pv/number.o: src/pv/number.c src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/signal.d src/pv/signal.o: src/pv/signal.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/state.d src/pv/state.o: src/pv/state.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/transfer.d src/pv/transfer.o: src/pv/transfer.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/watchpid.d src/pv/watchpid.o: src/pv/watchpid.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
diff --git a/autoconf/make/filelist.mk~ b/autoconf/make/filelist.mk~
deleted file mode 100644
index 7a214da..0000000
--- a/autoconf/make/filelist.mk~
+++ /dev/null
@@ -1,62 +0,0 @@
-# Automatically generated file listings
-#
-# Creation time: Tue Mar 30 07:17:40 BST 2021
-
-allsrc = src/library/getopt.c \
-src/library/gettext.c \
-src/main/debug.c \
-src/main/help.c \
-src/main/main.c \
-src/main/options.c \
-src/main/remote.c \
-src/main/version.c \
-src/pv/cursor.c \
-src/pv/display.c \
-src/pv/file.c \
-src/pv/loop.c \
-src/pv/number.c \
-src/pv/signal.c \
-src/pv/state.c \
-src/pv/transfer.c \
-src/pv/watchpid.c
-
-allobj = src/library/getopt.o \
-src/library/gettext.o \
-src/main/debug.o \
-src/main/help.o \
-src/main/main.o \
-src/main/options.o \
-src/main/remote.o \
-src/main/version.o \
-src/pv/cursor.o \
-src/pv/display.o \
-src/pv/file.o \
-src/pv/loop.o \
-src/pv/number.o \
-src/pv/signal.o \
-src/pv/state.o \
-src/pv/transfer.o \
-src/pv/watchpid.o \
-src/library.o \
-src/main.o \
-src/nls.o \
-src/pv.o
-
-alldep = src/library/getopt.d \
-src/library/gettext.d \
-src/main/debug.d \
-src/main/help.d \
-src/main/main.d \
-src/main/options.d \
-src/main/remote.d \
-src/main/version.d \
-src/pv/cursor.d \
-src/pv/display.d \
-src/pv/file.d \
-src/pv/loop.d \
-src/pv/number.d \
-src/pv/signal.d \
-src/pv/state.d \
-src/pv/transfer.d \
-src/pv/watchpid.d
-
diff --git a/autoconf/make/modules.mk~ b/autoconf/make/modules.mk~
deleted file mode 100644
index d810fa8..0000000
--- a/autoconf/make/modules.mk~
+++ /dev/null
@@ -1,14 +0,0 @@
-# Automatically generated module linking rules
-#
-# Creation time: Tue Mar 30 07:17:40 BST 2021
-
-src/library.o:  src/library/getopt.o src/library/gettext.o
-	$(LD) $(LDFLAGS) -o $@  src/library/getopt.o src/library/gettext.o
-
-src/main.o:  src/main/debug.o src/main/help.o src/main/main.o src/main/options.o src/main/remote.o src/main/version.o
-	$(LD) $(LDFLAGS) -o $@  src/main/debug.o src/main/help.o src/main/main.o src/main/options.o src/main/remote.o src/main/version.o
-
-src/pv.o:  src/pv/cursor.o src/pv/display.o src/pv/file.o src/pv/loop.o src/pv/number.o src/pv/signal.o src/pv/state.o src/pv/transfer.o src/pv/watchpid.o
-	$(LD) $(LDFLAGS) -o $@  src/pv/cursor.o src/pv/display.o src/pv/file.o src/pv/loop.o src/pv/number.o src/pv/signal.o src/pv/state.o src/pv/transfer.o src/pv/watchpid.o
-
-