--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2011-05-02  Eric Blake  <eblake@redhat.com>
 
+	exit: drop remaining clients
+	* modules/argmatch (Depends-on): Replace exit with stdlib.
+	* modules/copy-file (Depends-on): Likewise.
+	* modules/execute (Depends-on): Likewise.
+	* modules/exitfail (Depends-on): Likewise.
+	* modules/obstack (Depends-on): Likewise.
+	* modules/pagealign_alloc (Depends-on): Likewise.
+	* modules/pipe-filter-gi (Depends-on): Likewise.
+	* modules/pipe-filter-ii (Depends-on): Likewise.
+	* modules/savewd (Depends-on): Likewise.
+	* modules/spawn-pipe (Depends-on): Likewise.
+	* modules/wait-process (Depends-on): Likewise.
+	* modules/xsetenv (Depends-on): Likewise.
+	* modules/chdir-long (Depends-on): Add stdlib, for EXIT_FAILURE.
+	* modules/git-merge-changelog (Depends-on): Likewise.
+	* modules/long-options (Depends-on): Likewise.
+	* modules/pt_chown (Depends-on): Likewise.
+	* modules/sysexits (Depends-on): Likewise.
+
 	freading: relax license from LGPLv3+ to LGPLv2+
 	* modules/freading (License): Relax LGPL version.
 

--- a/modules/argmatch
+++ b/modules/argmatch
@@ -11,10 +11,10 @@
 error
 quotearg
 quote
-exit
 exitfail
 verify
 stdbool
+stdlib
 memcmp
 
 configure.ac:

--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -15,6 +15,7 @@
 mempcpy
 memrchr
 stdbool
+stdlib
 
 configure.ac:
 gl_FUNC_CHDIR_LONG

--- a/modules/copy-file
+++ b/modules/copy-file
@@ -10,11 +10,11 @@
 acl
 binary-io
 error
-exit
 full-write
 gettext-h
 open
 safe-read
+stdlib
 unistd
 xalloc
 

--- a/modules/execute
+++ b/modules/execute
@@ -11,7 +11,6 @@
 cloexec
 dup2
 error
-exit
 fatal-signal
 wait-process
 gettext-h
@@ -25,6 +24,7 @@
 posix_spawnattr_setflags
 posix_spawnattr_destroy
 stdbool
+stdlib
 strpbrk
 unistd
 environ

--- a/modules/exitfail
+++ b/modules/exitfail
@@ -6,7 +6,7 @@
 lib/exitfail.c
 
 Depends-on:
-exit
+stdlib
 
 configure.ac:
 

--- a/modules/git-merge-changelog
+++ b/modules/git-merge-changelog
@@ -7,6 +7,7 @@
 Depends-on:
 getopt-gnu
 stdbool
+stdlib
 progname
 error
 read-file

--- a/modules/long-options
+++ b/modules/long-options
@@ -8,6 +8,7 @@
 
 Depends-on:
 getopt-gnu
+stdlib
 version-etc
 
 configure.ac:

--- a/modules/obstack
+++ b/modules/obstack
@@ -7,9 +7,9 @@
 
 Depends-on:
 gettext-h
-exit
 exitfail
 stdint
+stdlib
 
 configure.ac:
 AC_FUNC_OBSTACK

--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -9,10 +9,10 @@
 
 Depends-on:
 error
-exit
 extensions
 getpagesize
 gettext-h
+stdlib
 xalloc
 unistd
 

--- a/modules/pipe-filter-gi
+++ b/modules/pipe-filter-gi
@@ -10,11 +10,11 @@
 spawn-pipe
 wait-process
 error
-exit
 fcntl-h
 gettext-h
 stdbool
 stdint
+stdlib
 sys_select
 unistd
 

--- a/modules/pipe-filter-ii
+++ b/modules/pipe-filter-ii
@@ -10,11 +10,11 @@
 spawn-pipe
 wait-process
 error
-exit
 fcntl-h
 gettext-h
 stdbool
 stdint
+stdlib
 sys_select
 unistd
 

--- a/modules/pt_chown
+++ b/modules/pt_chown
@@ -7,6 +7,7 @@
 
 Depends-on:
 ptsname
+stdlib
 
 configure.ac:
 

--- a/modules/savewd
+++ b/modules/savewd
@@ -9,12 +9,12 @@
 Depends-on:
 dosname
 errno
-exit
 fchdir
 fcntl-safer
 fcntl-h
 raise
 stdbool
+stdlib
 xalloc
 
 configure.ac:

--- a/modules/spawn-pipe
+++ b/modules/spawn-pipe
@@ -12,7 +12,6 @@
 dup2
 environ
 error
-exit
 fatal-signal
 gettext-h
 open
@@ -30,6 +29,7 @@
 posix_spawnattr_setflags
 posix_spawnattr_destroy
 stdbool
+stdlib
 strpbrk
 unistd
 unistd-safer

--- a/modules/sysexits
+++ b/modules/sysexits
@@ -7,6 +7,7 @@
 
 Depends-on:
 include_next
+stdlib
 
 configure.ac:
 gl_SYSEXITS

--- a/modules/wait-process
+++ b/modules/wait-process
@@ -10,10 +10,10 @@
 Depends-on:
 fatal-signal
 error
-exit
 xalloc
 gettext-h
 stdbool
+stdlib
 sys_wait
 unistd
 atexit

--- a/modules/xsetenv
+++ b/modules/xsetenv
@@ -10,8 +10,8 @@
 setenv
 unsetenv
 error
-exit
 gettext-h
+stdlib
 
 configure.ac: