New modules 'at-internal', 'openat-h', split off from module 'openat'.

* m4/openat.m4 (gl_FUNC_OPENAT): Don't set GNULIB_OPENAT. Don't
invoke gl_PREREQ_OPENAT and gl_MODULE_INDICATOR.
* modules/openat (Description): Add reference to POSIX function.
(Files): Remove lib/openat.h, lib/openat-proc.c.
(Depends-on): Add at-internal, openat-h. Remove fdopendir, gettext-h,
intprops, unistd.
(configure.ac): Remove AC_LIBOBJ of openat-proc. Invoke
gl_PREREQ_OPENAT, gl_MODULE_INDICATOR here. Invoke
gl_FCNTL_MODULE_INDICATOR.
(Include): Remove unistd.h, openat.h.
* modules/areadlinkat (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, extensions, fchdir,
openat-die, openat-h, save-cwd.
* modules/areadlinkat-with-size (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, extensions, fchdir,
openat-die, openat-h, save-cwd, unistd.
* modules/faccessat (Files): Add lib/at-func.c, lib/openat-priv.h.
(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
openat-h, save-cwd. Remove fcntl-h, openat.
* modules/fchmodat (Files): Remove lib/openat.h.
(Depends-on): Add at-internal, openat-h. Remove dirent, fcntl-h,
openat, stdbool, unistd.
* modules/fchownat (Files): Remove lib/openat.h.
(Depends-on): Add at-internal, openat-h. Remove dirent, fcntl-h,
openat, stdbool, sys_stat.
* modules/fdopendir (Files): Remove lib/openat-priv.h,
lib/openat-proc.c.
(Depends-on): Add at-internal.
(condigure.ac): Remove AC_LIBOBJ of openat-proc.
* modules/fstatat (Files): Remove lib/openat.h.
(Depends-on): Add at-internal, openat-h. Remove dirent, openat,
stdbool, unistd.
* modules/fts (Depends-on): Add openat-h.
* modules/linkat (Depends-on): Add at-internal, openat-h. Remove
openat.
* modules/mkdirat (Files): Remove lib/openat.h.
(Depends-on): Add at-internal, openat-h. Remove dirent, fcntl-h,
openat, stdbool, sys_stat.
* modules/mkfifoat (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
openat-h, save-cwd. Remove fcntl-h, openat.
* modules/openat-die (Depends-on): Add openat-h. Remove openat.
* modules/readlinkat (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
openat-h, save-cwd. Remove fcntl-h, openat.
* modules/renameat (Depends-on): Add at-internal, openat-h. Remove
openat.
* modules/selinux-at (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, extensions, fchdir,
fcntl-h, openat-die, openat-h, save-cwd, unistd. Remove openat.
* modules/symlinkat (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
openat-h, save-cwd. Remove fcntl-h, openat.
* modules/unlinkat (Files): Remove lib/openat.h.
(Depends-on): Add at-internal, openat-h. Remove dirent, openat,
stdbool.
* modules/utimensat (Files): Add lib/at-func.c.
(Depends-on): Add at-internal, dosname, errno, fchdir, fcntl-h,
openat-die, openat-h, save-cwd.
* modules/fchownat-tests (Depends-on): Add openat-h. Remove openat.
* modules/fdutimensat-tests (Depends-on): Add openat.
* modules/fstatat-tests (Depends-on): Add openat-h.
* modules/readlinkat-tests (Depends-on): Add openat.
* modules/symlinkat-tests (Depends-on): Add openat.

26 files changed, 178 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
index 2dd6a8aff7..d07a4b1f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,73 @@
 2011-11-05  Bruno Haible  <bruno@clisp.org>
 
+	New modules 'at-internal', 'openat-h', split off from module 'openat'.
+	* m4/openat.m4 (gl_FUNC_OPENAT): Don't set GNULIB_OPENAT. Don't
+	invoke gl_PREREQ_OPENAT and gl_MODULE_INDICATOR.
+	* modules/openat (Description): Add reference to POSIX function.
+	(Files): Remove lib/openat.h, lib/openat-proc.c.
+	(Depends-on): Add at-internal, openat-h. Remove fdopendir, gettext-h,
+	intprops, unistd.
+	(configure.ac): Remove AC_LIBOBJ of openat-proc. Invoke
+	gl_PREREQ_OPENAT, gl_MODULE_INDICATOR here. Invoke
+	gl_FCNTL_MODULE_INDICATOR.
+	(Include): Remove unistd.h, openat.h.
+	* modules/areadlinkat (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, extensions, fchdir,
+	openat-die, openat-h, save-cwd.
+	* modules/areadlinkat-with-size (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, extensions, fchdir,
+	openat-die, openat-h, save-cwd, unistd.
+	* modules/faccessat (Files): Add lib/at-func.c, lib/openat-priv.h.
+	(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
+	openat-h, save-cwd. Remove fcntl-h, openat.
+	* modules/fchmodat (Files): Remove lib/openat.h.
+	(Depends-on): Add at-internal, openat-h. Remove dirent, fcntl-h,
+	openat, stdbool, unistd.
+	* modules/fchownat (Files): Remove lib/openat.h.
+	(Depends-on): Add at-internal, openat-h. Remove dirent, fcntl-h,
+	openat, stdbool, sys_stat.
+	* modules/fdopendir (Files): Remove lib/openat-priv.h,
+	lib/openat-proc.c.
+	(Depends-on): Add at-internal.
+	(condigure.ac): Remove AC_LIBOBJ of openat-proc.
+	* modules/fstatat (Files): Remove lib/openat.h.
+	(Depends-on): Add at-internal, openat-h. Remove dirent, openat,
+	stdbool, unistd.
+	* modules/fts (Depends-on): Add openat-h.
+	* modules/linkat (Depends-on): Add at-internal, openat-h. Remove
+	openat.
+	* modules/mkdirat (Files): Remove lib/openat.h.
+	(Depends-on): Add at-internal, openat-h. Remove dirent, fcntl-h,
+	openat, stdbool, sys_stat.
+	* modules/mkfifoat (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
+	openat-h, save-cwd. Remove fcntl-h, openat.
+	* modules/openat-die (Depends-on): Add openat-h. Remove openat.
+	* modules/readlinkat (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
+	openat-h, save-cwd. Remove fcntl-h, openat.
+	* modules/renameat (Depends-on): Add at-internal, openat-h. Remove
+	openat.
+	* modules/selinux-at (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, extensions, fchdir,
+	fcntl-h, openat-die, openat-h, save-cwd, unistd. Remove openat.
+	* modules/symlinkat (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, fchdir, openat-die,
+	openat-h, save-cwd. Remove fcntl-h, openat.
+	* modules/unlinkat (Files): Remove lib/openat.h.
+	(Depends-on): Add at-internal, openat-h. Remove dirent, openat,
+	stdbool.
+	* modules/utimensat (Files): Add lib/at-func.c.
+	(Depends-on): Add at-internal, dosname, errno, fchdir, fcntl-h,
+	openat-die, openat-h, save-cwd.
+	* modules/fchownat-tests (Depends-on): Add openat-h. Remove openat.
+	* modules/fdutimensat-tests (Depends-on): Add openat.
+	* modules/fstatat-tests (Depends-on): Add openat-h.
+	* modules/readlinkat-tests (Depends-on): Add openat.
+	* modules/symlinkat-tests (Depends-on): Add openat.
+
+2011-11-05  Bruno Haible  <bruno@clisp.org>
+
 	openat: Include <stdbool.h>.
 	* lib/openat.c: Include <stdbool.h>.
 
diff --git a/m4/openat.m4 b/m4/openat.m4
index 97a821f901..cf42440f86 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,4 +1,4 @@
-# serial 42
+# serial 43
 # See if we need to use our replacement for Solaris' openat et al functions.
 
 dnl Copyright (C) 2004-2011 Free Software Foundation, Inc.
@@ -11,8 +11,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_OPENAT],
 [
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
-  GNULIB_OPENAT=1
-
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS_ONCE([openat])
   AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
@@ -26,13 +24,11 @@ AC_DEFUN([gl_FUNC_OPENAT],
     ;;
   *)
     HAVE_OPENAT=0
-    gl_PREREQ_OPENAT;;
+    ;;
   esac
-
-  dnl This is tested at least via getcwd.c.
-  gl_MODULE_INDICATOR([openat])
 ])
 
+# Prerequisites of lib/openat.c.
 AC_DEFUN([gl_PREREQ_OPENAT],
 [
   AC_REQUIRE([AC_C_INLINE])
diff --git a/modules/areadlinkat b/modules/areadlinkat
index 8c621d5757..16c77d5862 100644
--- a/modules/areadlinkat
+++ b/modules/areadlinkat
@@ -4,11 +4,20 @@ Reading symbolic links without size limitation, relative to fd.
 Files:
 lib/areadlink.h
 lib/areadlinkat.c
+lib/at-func.c
 
 Depends-on:
 areadlink
 careadlinkat
 readlinkat
+at-internal
+dosname
+errno
+extensions
+fchdir
+openat-die
+openat-h
+save-cwd
 
 configure.ac:
 gl_MODULE_INDICATOR([areadlinkat])
diff --git a/modules/areadlinkat-with-size b/modules/areadlinkat-with-size
index 162defe5e3..092af0f2a8 100644
--- a/modules/areadlinkat-with-size
+++ b/modules/areadlinkat-with-size
@@ -4,11 +4,21 @@ Read a symbolic link, without size limitations, relative to fd.
 Files:
 lib/areadlink.h
 lib/areadlinkat-with-size.c
+lib/at-func.c
 
 Depends-on:
 areadlink-with-size
 stdint
 readlinkat
+at-internal
+dosname
+errno
+extensions
+fchdir
+openat-die
+openat-h
+save-cwd
+unistd
 
 configure.ac:
 gl_MODULE_INDICATOR([areadlinkat-with-size])
diff --git a/modules/faccessat b/modules/faccessat
index ce8fa0d892..6fc43545e4 100644
--- a/modules/faccessat
+++ b/modules/faccessat
@@ -3,14 +3,21 @@ faccessat() function: check user's permissions for a file.
 
 Files:
 lib/faccessat.c
+lib/at-func.c
+lib/openat-priv.h
 m4/faccessat.m4
 
 Depends-on:
-unistd
+at-internal
+dosname
+errno
 extensions
-fcntl-h
+fchdir
+openat-die
+openat-h
+save-cwd
+unistd
 euidaccess      [test $HAVE_FACCESSAT = 0]
-openat          [test $HAVE_FACCESSAT = 0]
 
 configure.ac:
 gl_FUNC_FACCESSAT
diff --git a/modules/fchmodat b/modules/fchmodat
index 7613549839..67881c6318 100644
--- a/modules/fchmodat
+++ b/modules/fchmodat
@@ -4,23 +4,19 @@ fchmodat() function: Change access permissions of a file at a directory.
 Files:
 lib/fchmodat.c
 lib/at-func.c
-lib/openat.h
 lib/openat-priv.h
 m4/fchmodat.m4
 
 Depends-on:
-dirent
+at-internal
 dosname
 errno
 extensions
 fchdir
-fcntl-h
-openat
 openat-die
+openat-h
 save-cwd
-stdbool
 sys_stat
-unistd
 
 configure.ac:
 gl_FUNC_FCHMODAT
diff --git a/modules/fchownat b/modules/fchownat
index a0ee9b1fc1..97a84e48cf 100644
--- a/modules/fchownat
+++ b/modules/fchownat
@@ -4,24 +4,20 @@ fchownat() function: Change the owner of a file at a directory.
 Files:
 lib/fchownat.c
 lib/at-func.c
-lib/openat.h
 lib/openat-priv.h
 m4/fchownat.m4
 
 Depends-on:
-dirent
+at-internal
 dosname
 errno
 extensions
 fchdir
-fcntl-h
 fstatat
 lchown          [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1]
-openat
 openat-die
+openat-h
 save-cwd
-stdbool
-sys_stat
 unistd
 
 configure.ac:
diff --git a/modules/fchownat-tests b/modules/fchownat-tests
index 9252b1e6b1..1b79d47f55 100644
--- a/modules/fchownat-tests
+++ b/modules/fchownat-tests
@@ -9,7 +9,7 @@ tests/macros.h
 Depends-on:
 ignore-value
 mgetgroups
-openat
+openat-h
 progname
 usleep
 stat-time
diff --git a/modules/fdopendir b/modules/fdopendir
index 9cdf58e1d0..ee9a875396 100644
--- a/modules/fdopendir
+++ b/modules/fdopendir
@@ -3,13 +3,12 @@ Open a directory stream from a file descriptor.
 
 Files:
 lib/fdopendir.c
-lib/openat-priv.h
-lib/openat-proc.c
 m4/fdopendir.m4
 
 Depends-on:
 dirent
 extensions
+at-internal     [test $HAVE_FDOPENDIR = 0]
 dup             [test $HAVE_FDOPENDIR = 0]
 errno           [test $HAVE_FDOPENDIR = 0]
 fchdir          [test $HAVE_FDOPENDIR = 0]
@@ -23,9 +22,6 @@ gl_FUNC_FDOPENDIR
 if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then
   AC_LIBOBJ([fdopendir])
 fi
-if test $HAVE_FDOPENDIR = 0; then
-  AC_LIBOBJ([openat-proc])
-fi
 gl_DIRENT_MODULE_INDICATOR([fdopendir])
 gl_MODULE_INDICATOR([fdopendir])
 
diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index 8c1dc39093..1ca9b0a52e 100644
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -9,6 +9,7 @@ tests/macros.h
 
 Depends-on:
 ignore-value
+openat
 timespec
 dup
 usleep
diff --git a/modules/fstatat b/modules/fstatat
index 77e7a9b931..baea7cd51e 100644
--- a/modules/fstatat
+++ b/modules/fstatat
@@ -4,12 +4,11 @@ fstatat() function: Return information about a file at a directory.
 Files:
 lib/fstatat.c
 lib/at-func.c
-lib/openat.h
 lib/openat-priv.h
 m4/fstatat.m4
 
 Depends-on:
-dirent
+at-internal
 dosname
 errno
 extensions
@@ -17,12 +16,10 @@ fchdir
 fcntl-h
 fstat
 lstat
-openat
 openat-die
+openat-h
 save-cwd
-stdbool
 sys_stat
-unistd
 
 configure.ac:
 gl_FUNC_FSTATAT
diff --git a/modules/fstatat-tests b/modules/fstatat-tests
index f33ff11f0d..25dc559897 100644
--- a/modules/fstatat-tests
+++ b/modules/fstatat-tests
@@ -8,6 +8,7 @@ tests/macros.h
 Depends-on:
 getcwd-lgpl
 ignore-value
+openat-h
 progname
 symlink
 
diff --git a/modules/fts b/modules/fts
index b879134810..62c329bfe5 100644
--- a/modules/fts
+++ b/modules/fts
@@ -23,6 +23,7 @@ hash
 i-ring
 lstat
 memmove
+openat-h
 openat-safer
 opendir
 readdir
diff --git a/modules/linkat b/modules/linkat
index 0ec207ed59..3b6559d6bf 100644
--- a/modules/linkat
+++ b/modules/linkat
@@ -11,6 +11,7 @@ unistd
 extensions
 areadlink        [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 areadlinkat      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+at-internal      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 dirname-lgpl     [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 dosname          [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 errno            [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
@@ -19,7 +20,7 @@ filenamecat-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 fstat            [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 fstatat          [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 getcwd-lgpl      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
-openat           [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
+openat-h         [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 openat-die       [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 link             [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
 link-follow      [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1]
diff --git a/modules/mkdirat b/modules/mkdirat
index d59689c79e..f3b8511331 100644
--- a/modules/mkdirat
+++ b/modules/mkdirat
@@ -4,23 +4,19 @@ mkdirat() function: Create a directory relative to a given directory.
 Files:
 lib/mkdirat.c
 lib/at-func.c
-lib/openat.h
 lib/openat-priv.h
 m4/mkdirat.m4
 
 Depends-on:
-dirent
+at-internal
 dosname
 errno
 extensions
 fchdir
-fcntl-h
 mkdir           [test $HAVE_MKDIRAT = 0]
-openat
 openat-die
+openat-h
 save-cwd
-stdbool
-sys_stat
 unistd
 
 configure.ac:
diff --git a/modules/mkfifoat b/modules/mkfifoat
index 6197d64b0f..443efc996b 100644
--- a/modules/mkfifoat
+++ b/modules/mkfifoat
@@ -4,15 +4,21 @@ mkfifoat() and mknodat(): create named FIFOs relative to a directory
 Files:
 lib/mkfifoat.c
 lib/mknodat.c
+lib/at-func.c
 m4/mkfifoat.m4
 
 Depends-on:
-sys_stat
+at-internal
+dosname
+errno
 extensions
-fcntl-h
+fchdir
+openat-die
+openat-h
+save-cwd
+sys_stat
 mkfifo          [test $HAVE_MKFIFOAT = 0]
 mknod           [test $HAVE_MKNODAT = 0]
-openat          [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0]
 
 configure.ac:
 gl_FUNC_MKFIFOAT
diff --git a/modules/openat b/modules/openat
index c051e71823..995c280cb3 100644
--- a/modules/openat
+++ b/modules/openat
@@ -1,46 +1,42 @@
 Description:
-Open a file at a directory.
+openat() function: Open a file at a directory.
 
 Files:
 lib/at-func.c
 lib/openat.c
-lib/openat.h
 lib/openat-priv.h
-lib/openat-proc.c
 m4/openat.m4
 m4/mode_t.m4
 
 Depends-on:
+at-internal
 dosname
 errno
 extensions
 fchdir
 fcntl-h
-fdopendir
 fstat
-gettext-h
-intprops
 largefile
 open
 openat-die
+openat-h
 save-cwd
 stdbool
 sys_stat
-unistd
 
 configure.ac:
 gl_FUNC_OPENAT
-AC_LIBOBJ([openat-proc])
 if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then
   AC_LIBOBJ([openat])
+  gl_PREREQ_OPENAT
 fi
+gl_MODULE_INDICATOR([openat]) dnl for lib/getcwd.c
+gl_FCNTL_MODULE_INDICATOR([openat])
 
 Makefile.am:
 
 Include:
 <fcntl.h>
-<unistd.h>
-"openat.h"
 
 License:
 GPL
diff --git a/modules/openat-die b/modules/openat-die
index 76cc44dc17..08bef776f6 100644
--- a/modules/openat-die
+++ b/modules/openat-die
@@ -5,10 +5,10 @@ Files:
 lib/openat-die.c
 
 Depends-on:
-openat
+openat-h
 error
-gettext-h
 exitfail
+gettext-h
 
 configure.ac:
 
diff --git a/modules/readlinkat b/modules/readlinkat
index ea35d8882a..3bf67110b8 100644
--- a/modules/readlinkat
+++ b/modules/readlinkat
@@ -3,13 +3,19 @@ readlinkat(): read symlinks relative to a directory
 
 Files:
 lib/readlinkat.c
+lib/at-func.c
 m4/readlinkat.m4
 
 Depends-on:
-unistd
+at-internal
+dosname
+errno
 extensions
-fcntl-h
-openat          [test $HAVE_READLINKAT = 0]
+fchdir
+openat-die
+openat-h
+save-cwd
+unistd
 readlink        [test $HAVE_READLINKAT = 0]
 
 configure.ac:
diff --git a/modules/readlinkat-tests b/modules/readlinkat-tests
index 6c57fdfd46..1fdaa59824 100644
--- a/modules/readlinkat-tests
+++ b/modules/readlinkat-tests
@@ -6,6 +6,7 @@ tests/macros.h
 
 Depends-on:
 ignore-value
+openat
 symlinkat
 unlinkat
 
diff --git a/modules/renameat b/modules/renameat
index 0558fe7e6e..45b8e9a1b4 100644
--- a/modules/renameat
+++ b/modules/renameat
@@ -10,13 +10,14 @@ Depends-on:
 stdio
 extensions
 fcntl-h
+at-internal      [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 dosname          [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 filenamecat-lgpl [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 fstat            [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 fstatat          [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 getcwd-lgpl      [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
-openat           [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 openat-die       [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
+openat-h         [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 rename           [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 same-inode       [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
 save-cwd         [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1]
diff --git a/modules/selinux-at b/modules/selinux-at
index 925219d111..62dd6e6824 100644
--- a/modules/selinux-at
+++ b/modules/selinux-at
@@ -2,12 +2,22 @@ Description:
 openat-style fd-relative functions for SE Linux
 
 Files:
-lib/selinux-at.c
 lib/selinux-at.h
+lib/selinux-at.c
+lib/at-func.c
 
 Depends-on:
-openat
 selinux-h
+at-internal
+dosname
+errno
+extensions
+fchdir
+fcntl-h
+openat-die
+openat-h
+save-cwd
+unistd
 
 configure.ac:
 AC_CHECK_HEADERS([selinux/flask.h])
diff --git a/modules/symlinkat b/modules/symlinkat
index 7636b29361..93bded1d88 100644
--- a/modules/symlinkat
+++ b/modules/symlinkat
@@ -3,13 +3,19 @@ symlinkat(): create symlinks relative to a directory
 
 Files:
 lib/symlinkat.c
+lib/at-func.c
 m4/symlinkat.m4
 
 Depends-on:
-unistd
+at-internal
+dosname
+errno
 extensions
-fcntl-h
-openat          [test $HAVE_SYMLINKAT = 0]
+fchdir
+openat-die
+openat-h
+save-cwd
+unistd
 symlink         [test $HAVE_SYMLINKAT = 0]
 
 configure.ac:
diff --git a/modules/symlinkat-tests b/modules/symlinkat-tests
index 90331494a4..c8a05ff81d 100644
--- a/modules/symlinkat-tests
+++ b/modules/symlinkat-tests
@@ -6,6 +6,7 @@ tests/macros.h
 
 Depends-on:
 ignore-value
+openat
 
 configure.ac:
 
diff --git a/modules/unlinkat b/modules/unlinkat
index 405c2fb535..7ab422ec87 100644
--- a/modules/unlinkat
+++ b/modules/unlinkat
@@ -4,23 +4,21 @@ unlinkat() function: Remove a file at a directory.
 Files:
 lib/unlinkat.c
 lib/at-func.c
-lib/openat.h
 lib/openat-priv.h
 m4/unlinkat.m4
 
 Depends-on:
-dirent
+at-internal
 dosname
 errno
 extensions
 fchdir
 fcntl-h
 fstatat
-openat
 openat-die
+openat-h
 rmdir           [test $HAVE_UNLINKAT = 0]
 save-cwd
-stdbool
 sys_stat
 unistd
 unlink          [test $HAVE_UNLINKAT = 0]
diff --git a/modules/utimensat b/modules/utimensat
index 9f3ec7efcf..1839d435e5 100644
--- a/modules/utimensat
+++ b/modules/utimensat
@@ -3,11 +3,20 @@ Set file access and modification times of a file relative to a directory fd.
 
 Files:
 lib/utimensat.c
+lib/at-func.c
 m4/utimensat.m4
 
 Depends-on:
-sys_stat
+at-internal
+dosname
+errno
 extensions
+fchdir
+fcntl-h
+openat-die
+openat-h
+save-cwd
+sys_stat
 fstatat         [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
 utimens         [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]