assert-h: prefer to ‘verify’

Where it’s easy, prefer ‘static_assert’ to ‘verify’,
as this simplifies the source by removing the need to
include verify.h.  Keep using ‘verify’ if verify.h
is used for other reasons, or if code is shared with glibc.
* lib/alignalloc.c, lib/argmatch.h, lib/c32is-impl.h:
* lib/c32snrtombs.c, lib/c32srtombs.c, lib/exclude.c:
* lib/filevercmp.c, lib/fma.c, lib/i-ring.h, lib/ino-map.c:
* lib/localeinfo.c, lib/malloca.c, lib/mbrtoc32.c, lib/mbrtowc.c:
* lib/mbsinit.c, lib/mbsnrtoc32s.c, lib/mbsrtoc32s.c:
* lib/nanosleep.c, lib/parse-datetime.y, lib/pipe2.c:
* lib/rawmemchr.c, lib/relocwrapper.c, lib/sleep.c:
* lib/stat-w32.c, lib/strerror.c, lib/strtoimax.c:
* lib/utimecmp.c, lib/vasnprintf.c, tests/test-alignof.c:
* tests/test-intprops.c, tests/test-libgmp.c:
* tests/test-limits-h.c, tests/test-locale.c:
* tests/test-pthread.c, tests/test-round2.c:
* tests/test-stdalign.c, tests/test-stddef.c, tests/test-stdio.c:
* tests/test-stdlib.c, tests/test-string.c, tests/test-sys_stat.c:
* tests/test-time.c, tests/test-uchar.c, tests/test-unistd.c:
* tests/test-wchar.c:
Prefer static_assert to verify, and stop including verify.h.
* lib/stat.c: Don’t include verify.h (this include was unnecessary).
* modules/alignalloc, modules/alignof-tests, modules/argmatch:
* modules/c-vasnprintf, modules/c32isalnum, modules/c32isalpha:
* modules/c32isblank, modules/c32iscntrl, modules/c32isdigit:
* modules/c32isgraph, modules/c32islower, modules/c32isprint:
* modules/c32ispunct, modules/c32isspace, modules/c32isupper:
* modules/c32isxdigit, modules/c32snrtombs, modules/c32srtombs:
* modules/exclude, modules/filevercmp, modules/fma, modules/fmaf:
* modules/fmal, modules/fstat, modules/i-ring, modules/ino-map:
* modules/intprops-tests, modules/libgmp-tests:
* modules/limits-h-tests, modules/locale-tests, modules/malloca:
* modules/mbrtoc32, modules/mbrtowc, modules/mbsinit:
* modules/mbsnrtoc32s, modules/mbsrtoc32s, modules/nanosleep:
* modules/parse-datetime, modules/pipe2, modules/pthread-h-tests:
* modules/rawmemchr, modules/relocatable-prog-wrapper:
* modules/round-tests, modules/roundf-tests, modules/sleep:
* modules/stat, modules/stdalign-tests, modules/stdckdint-tests:
* modules/stddef-tests, modules/stdio-tests, modules/stdlib-tests:
* modules/strerror, modules/string-tests, modules/strtoimax:
* modules/strtoumax, modules/sys_stat-tests, modules/time-tests:
* modules/uchar-tests, modules/unistd-tests:
* modules/unistdio/u16-u16-vasnprintf:
* modules/unistdio/u16-vasnprintf:
* modules/unistdio/u32-u32-vasnprintf:
* modules/unistdio/u32-vasnprintf:
* modules/unistdio/u8-u8-vasnprintf:
* modules/unistdio/u8-vasnprintf, modules/unistdio/ulc-vasnprintf:
* modules/utimecmp, modules/vasnprintf, modules/wchar-tests:
Depend on assert-h, not verify.

69 files changed, 69 insertions, 70 deletions

diff --git a/modules/alignalloc b/modules/alignalloc
index 42ca672bc2..0a34b4bcf4 100644
--- a/modules/alignalloc
+++ b/modules/alignalloc
@@ -7,6 +7,7 @@ lib/alignalloc.c
 m4/alignalloc.m4
 
 Depends-on:
+assert-h
 extensions
 extern-inline
 idx
@@ -14,7 +15,6 @@ posix_memalign
 stdalign
 stdckdint
 stdint
-verify
 
 configure.ac:
 gl_ALIGNALLOC
diff --git a/modules/alignof-tests b/modules/alignof-tests
index be4cb942be..598351790e 100644
--- a/modules/alignof-tests
+++ b/modules/alignof-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-alignof.c
 
 Depends-on:
-verify
+assert-h
 stdint
 
 configure.ac:
@@ -10,4 +10,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-alignof
 check_PROGRAMS += test-alignof
-
diff --git a/modules/argmatch b/modules/argmatch
index 97d84fbb93..bd534f5056 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -6,6 +6,7 @@ lib/argmatch.h
 lib/argmatch.c
 
 Depends-on:
+assert-h
 c99
 error
 exitfail
@@ -16,7 +17,6 @@ quote
 quotearg
 stdbool
 stdlib
-verify
 
 configure.ac:
 
diff --git a/modules/c-vasnprintf b/modules/c-vasnprintf
index f193f70856..44259c1f0e 100644
--- a/modules/c-vasnprintf
+++ b/modules/c-vasnprintf
@@ -22,6 +22,7 @@ m4/math_h.m4
 m4/exponentd.m4
 
 Depends-on:
+assert-h
 attribute
 stdio
 isnand-nolibm
@@ -39,7 +40,6 @@ xsize
 errno
 memchr
 multiarch
-verify
 
 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
diff --git a/modules/c32isalnum b/modules/c32isalnum
index b03ba7fbc3..a6e42fefd4 100644
--- a/modules/c32isalnum
+++ b/modules/c32isalnum
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-alnum
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isalpha b/modules/c32isalpha
index d39e869471..8081cc2671 100644
--- a/modules/c32isalpha
+++ b/modules/c32isalpha
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-alpha
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isblank b/modules/c32isblank
index 948ae36212..1d3938b754 100644
--- a/modules/c32isblank
+++ b/modules/c32isblank
@@ -14,7 +14,7 @@ iswblank
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-blank
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32iscntrl b/modules/c32iscntrl
index b3f1ac7dbb..9ec924f96a 100644
--- a/modules/c32iscntrl
+++ b/modules/c32iscntrl
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-cntrl
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isdigit b/modules/c32isdigit
index 3b82dc91b2..a9449cd6b1 100644
--- a/modules/c32isdigit
+++ b/modules/c32isdigit
@@ -14,7 +14,7 @@ iswdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-digit
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isgraph b/modules/c32isgraph
index 30dc8cb2cd..6d6ef2785a 100644
--- a/modules/c32isgraph
+++ b/modules/c32isgraph
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-graph
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32islower b/modules/c32islower
index eb075f3b80..1659125631 100644
--- a/modules/c32islower
+++ b/modules/c32islower
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-lower
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isprint b/modules/c32isprint
index db7bedc980..96049e3878 100644
--- a/modules/c32isprint
+++ b/modules/c32isprint
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-print
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32ispunct b/modules/c32ispunct
index 2b132dc0b4..1e45a01a38 100644
--- a/modules/c32ispunct
+++ b/modules/c32ispunct
@@ -14,7 +14,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-punct
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isspace b/modules/c32isspace
index 144aa9b5fc..f72b6ec27b 100644
--- a/modules/c32isspace
+++ b/modules/c32isspace
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-space
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isupper b/modules/c32isupper
index 26bc18d51f..09d41ad2ec 100644
--- a/modules/c32isupper
+++ b/modules/c32isupper
@@ -13,7 +13,7 @@ wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-upper
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32isxdigit b/modules/c32isxdigit
index f4f31c44d9..2cc4b3e21b 100644
--- a/modules/c32isxdigit
+++ b/modules/c32isxdigit
@@ -15,7 +15,7 @@ iswxdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]
 streq           [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-xdigit
-verify
+assert-h
 
 configure.ac:
 AC_REQUIRE([gl_UCHAR_H])
diff --git a/modules/c32snrtombs b/modules/c32snrtombs
index 4ced9f2628..6edf7174ed 100644
--- a/modules/c32snrtombs
+++ b/modules/c32snrtombs
@@ -9,7 +9,7 @@ lib/c32srtombs-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 c32rtomb
 wcsnrtombs      [test $SMALL_WCHAR_T = 0]
 
diff --git a/modules/c32srtombs b/modules/c32srtombs
index 1f36b6cc66..4d82ab7bdc 100644
--- a/modules/c32srtombs
+++ b/modules/c32srtombs
@@ -9,7 +9,7 @@ lib/c32srtombs-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 c32rtomb
 wcsrtombs       [test $SMALL_WCHAR_T = 0]
 
diff --git a/modules/exclude b/modules/exclude
index 13871bd635..bd785cada9 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -6,6 +6,7 @@ lib/exclude.h
 lib/exclude.c
 
 Depends-on:
+assert-h
 filename
 fnmatch
 fopen-gnu
@@ -15,7 +16,6 @@ mbuiter
 regex
 stdbool
 unlocked-io-internal
-verify
 xalloc
 
 configure.ac:
diff --git a/modules/filevercmp b/modules/filevercmp
index 4786ce11b6..6c11bb7278 100644
--- a/modules/filevercmp
+++ b/modules/filevercmp
@@ -6,10 +6,10 @@ lib/filevercmp.h
 lib/filevercmp.c
 
 Depends-on:
+assert-h
 c-ctype
 idx
 stdbool
-verify
 
 configure.ac:
 
diff --git a/modules/fma b/modules/fma
index dc45a94826..14e841842d 100644
--- a/modules/fma
+++ b/modules/fma
@@ -12,7 +12,7 @@ Depends-on:
 math
 float           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 stdbool         [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
-verify          [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
+assert-h        [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 isfinite        [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 integer_length  [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 frexp           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
diff --git a/modules/fmaf b/modules/fmaf
index 53fe229c10..8373d61bc5 100644
--- a/modules/fmaf
+++ b/modules/fmaf
@@ -14,7 +14,7 @@ math
 extensions
 float           [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 stdbool         [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
-verify          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
+assert-h         [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 isfinite        [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 integer_length  [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 frexpf          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
diff --git a/modules/fmal b/modules/fmal
index e24ff02a95..3927262e6a 100644
--- a/modules/fmal
+++ b/modules/fmal
@@ -15,7 +15,7 @@ extensions
 fma             [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
 float           [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 stdbool         [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
-verify          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+assert-h        [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 isfinite        [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 integer_length  [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
diff --git a/modules/fstat b/modules/fstat
index 508aa76a22..394f2fa4ed 100644
--- a/modules/fstat
+++ b/modules/fstat
@@ -14,7 +14,7 @@ pathmax         [test $REPLACE_FSTAT = 1]
 stat            [test $REPLACE_FSTAT = 1]
 stat-time       [test $REPLACE_FSTAT = 1]
 unistd          [test $REPLACE_FSTAT = 1]
-verify          [test $REPLACE_FSTAT = 1]
+assert-h        [test $REPLACE_FSTAT = 1]
 msvc-nothrow    [test $REPLACE_FSTAT = 1]
 
 configure.ac:
diff --git a/modules/i-ring b/modules/i-ring
index 374970694b..1d23a9fe51 100644
--- a/modules/i-ring
+++ b/modules/i-ring
@@ -7,8 +7,8 @@ lib/i-ring.c
 m4/i-ring.m4
 
 Depends-on:
+assert-h
 stdbool
-verify
 
 configure.ac:
 gl_I_RING
diff --git a/modules/ino-map b/modules/ino-map
index c340d1ef4c..8905b2ae9c 100644
--- a/modules/ino-map
+++ b/modules/ino-map
@@ -6,8 +6,8 @@ lib/ino-map.c
 lib/ino-map.h
 
 Depends-on:
+assert-h
 hash
-verify
 
 configure.ac:
 
diff --git a/modules/intprops-tests b/modules/intprops-tests
index f02b357584..1a230ccde8 100644
--- a/modules/intprops-tests
+++ b/modules/intprops-tests
@@ -3,9 +3,9 @@ tests/test-intprops.c
 tests/macros.h
 
 Depends-on:
+assert-h
 inttypes
 stdbool
-verify
 
 configure.ac:
 
diff --git a/modules/libgmp-tests b/modules/libgmp-tests
index a80c478c77..b0cb73d1f4 100644
--- a/modules/libgmp-tests
+++ b/modules/libgmp-tests
@@ -3,8 +3,8 @@ tests/macros.h
 tests/test-libgmp.c
 
 Depends-on:
+assert-h
 c99
-verify
 
 configure.ac:
 
diff --git a/modules/limits-h-tests b/modules/limits-h-tests
index 7a70e5782b..2cf0a41f5d 100644
--- a/modules/limits-h-tests
+++ b/modules/limits-h-tests
@@ -2,8 +2,8 @@ Files:
 tests/test-limits-h.c
 
 Depends-on:
+assert-h
 extensions
-verify
 limits-h-c++-tests
 
 configure.ac:
diff --git a/modules/locale-tests b/modules/locale-tests
index 2e661f7565..11b840da9a 100644
--- a/modules/locale-tests
+++ b/modules/locale-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-locale.c
 
 Depends-on:
-verify
+assert-h
 locale-c++-tests
 
 configure.ac:
diff --git a/modules/malloca b/modules/malloca
index 9c279c45f1..6e5fc8d566 100644
--- a/modules/malloca
+++ b/modules/malloca
@@ -9,10 +9,10 @@ m4/eealloc.m4
 
 Depends-on:
 alloca-opt
+assert-h
 idx
 stdckdint
 stdint
-verify
 xalloc-oversized
 
 configure.ac:
diff --git a/modules/mbrtoc32 b/modules/mbrtoc32
index 63ed5ebe1f..4757bcbe02 100644
--- a/modules/mbrtoc32
+++ b/modules/mbrtoc32
@@ -22,9 +22,9 @@ attribute       [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 c99             [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
 hard-locale     [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
 mbrtowc         [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
+assert-h        [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 localcharset    [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 streq           [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
-verify          [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 
 configure.ac:
 gl_FUNC_MBRTOC32
diff --git a/modules/mbrtowc b/modules/mbrtowc
index ed9ebd7152..e81da6f350 100644
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -26,9 +26,9 @@ attribute       [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 stdint          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 hard-locale     [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
 mbsinit         [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
+assert-h        [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 localcharset    [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 streq           [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
-verify          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBRTOWC
diff --git a/modules/mbsinit b/modules/mbsinit
index c500620b40..1040068223 100644
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -9,8 +9,8 @@ m4/mbstate_t.m4
 Depends-on:
 wchar
 extensions
+assert-h        [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 mbrtowc         [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
-verify          [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 
 configure.ac:
 gl_FUNC_MBSINIT
diff --git a/modules/mbsnrtoc32s b/modules/mbsnrtoc32s
index ac464a8950..24a8458f3f 100644
--- a/modules/mbsnrtoc32s
+++ b/modules/mbsnrtoc32s
@@ -9,7 +9,7 @@ lib/mbsrtoc32s-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 mbrtoc32
 minmax
 strnlen1
diff --git a/modules/mbsrtoc32s b/modules/mbsrtoc32s
index 64892cf2a7..f9d97d7548 100644
--- a/modules/mbsrtoc32s
+++ b/modules/mbsrtoc32s
@@ -9,7 +9,7 @@ lib/mbsrtoc32s-state.c
 Depends-on:
 uchar
 wchar
-verify
+assert-h
 mbrtoc32
 strnlen1
 mbsrtowcs       [test $SMALL_WCHAR_T = 0]
diff --git a/modules/nanosleep b/modules/nanosleep
index a8d0c76744..d0855460cd 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -9,11 +9,11 @@ Depends-on:
 time
 extensions
 multiarch
+assert-h        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 intprops        [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 pselect         [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 stdbool         [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 sys_select      [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
-verify          [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
 
 configure.ac:
 gl_FUNC_NANOSLEEP
diff --git a/modules/parse-datetime b/modules/parse-datetime
index 8a2d050dee..72aa6af659 100644
--- a/modules/parse-datetime
+++ b/modules/parse-datetime
@@ -9,6 +9,7 @@ m4/tm_gmtoff.m4
 m4/parse-datetime.m4
 
 Depends-on:
+assert-h
 bison
 c99
 c-ctype
@@ -26,7 +27,6 @@ time
 time_r
 time_rz
 timegm
-verify
 
 configure.ac:
 gl_PARSE_DATETIME
diff --git a/modules/pipe2 b/modules/pipe2
index 08758ba77a..a933d626f0 100644
--- a/modules/pipe2
+++ b/modules/pipe2
@@ -10,7 +10,7 @@ unistd
 fcntl-h
 binary-io
 extensions
-verify
+assert-h
 
 configure.ac:
 gl_FUNC_PIPE2
diff --git a/modules/pthread-h-tests b/modules/pthread-h-tests
index 13fd05b3a0..962ff0e7ca 100644
--- a/modules/pthread-h-tests
+++ b/modules/pthread-h-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-pthread.c
 
 Depends-on:
-verify
+assert-h
 pthread-h-c++-tests
 
 configure.ac:
diff --git a/modules/rawmemchr b/modules/rawmemchr
index f3e46881d5..03da3a27b7 100644
--- a/modules/rawmemchr
+++ b/modules/rawmemchr
@@ -7,11 +7,11 @@ lib/rawmemchr.valgrind
 m4/rawmemchr.m4
 
 Depends-on:
+assert-h
 extensions
 stdalign
 stdint
 string
-verify
 
 configure.ac:
 gl_FUNC_RAWMEMCHR
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index 9b9d9c3abe..a60aa24d67 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -51,6 +51,7 @@ m4/relocatable-lib.m4
 m4/setenv.m4
 
 Depends-on:
+assert-h
 c99
 double-slash-root
 eloop-threshold
@@ -73,7 +74,6 @@ stdlib
 string
 sys_stat
 unistd
-verify
 xalloc-oversized
 
 configure.ac-early:
diff --git a/modules/round-tests b/modules/round-tests
index 2c4b37bf6e..6a0de71cf7 100644
--- a/modules/round-tests
+++ b/modules/round-tests
@@ -8,10 +8,10 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+assert-h
 isnand-nolibm
 stdbool
 stdint
-verify
 
 configure.ac:
 
diff --git a/modules/roundf-tests b/modules/roundf-tests
index cd8af30202..29f06e45c2 100644
--- a/modules/roundf-tests
+++ b/modules/roundf-tests
@@ -9,12 +9,12 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+assert-h
 ceilf
 floorf
 isnanf-nolibm
 stdbool
 stdint
-verify
 
 configure.ac:
 
diff --git a/modules/sleep b/modules/sleep
index 8ce74a43d9..fb81ebd683 100644
--- a/modules/sleep
+++ b/modules/sleep
@@ -7,8 +7,8 @@ m4/sleep.m4
 
 Depends-on:
 unistd
+assert-h        [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
 stdint          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
-verify          [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1]
 
 configure.ac:
 gl_FUNC_SLEEP
diff --git a/modules/stat b/modules/stat
index 96d7a03fd5..0d01ab6055 100644
--- a/modules/stat
+++ b/modules/stat
@@ -10,12 +10,12 @@ m4/stat.m4
 Depends-on:
 sys_stat
 largefile
+assert-h        [test $REPLACE_STAT = 1]
 filename        [test $REPLACE_STAT = 1]
 malloca         [test $REPLACE_STAT = 1]
 pathmax         [test $REPLACE_STAT = 1]
 stat-time       [test $REPLACE_STAT = 1]
 stdbool         [test $REPLACE_STAT = 1]
-verify          [test $REPLACE_STAT = 1]
 
 configure.ac:
 gl_FUNC_STAT
diff --git a/modules/stdalign-tests b/modules/stdalign-tests
index 138fe3550e..e4665ed5fc 100644
--- a/modules/stdalign-tests
+++ b/modules/stdalign-tests
@@ -3,7 +3,7 @@ tests/test-stdalign.c
 tests/macros.h
 
 Depends-on:
-verify
+assert-h
 stdint
 stdalign-c++-tests
 
diff --git a/modules/stdckdint-tests b/modules/stdckdint-tests
index fb809dac3e..a4115ca44b 100644
--- a/modules/stdckdint-tests
+++ b/modules/stdckdint-tests
@@ -4,9 +4,9 @@ tests/test-intprops.c
 tests/test-stdckdint.c
 
 Depends-on:
+assert-h
 inttypes
 stdbool
-verify
 stdckdint-c++-tests
 
 configure.ac:
diff --git a/modules/stddef-tests b/modules/stddef-tests
index bb71e110b7..644eb0d7aa 100644
--- a/modules/stddef-tests
+++ b/modules/stddef-tests
@@ -2,8 +2,8 @@ Files:
 tests/test-stddef.c
 
 Depends-on:
+assert-h
 stdalign
-verify
 stddef-c++-tests
 
 configure.ac:
diff --git a/modules/stdio-tests b/modules/stdio-tests
index fcda690b7a..5368a2c64c 100644
--- a/modules/stdio-tests
+++ b/modules/stdio-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-stdio.c
 
 Depends-on:
-verify
+assert-h
 stdio-c++-tests
 fgetc-tests
 fputc-tests
diff --git a/modules/stdlib-tests b/modules/stdlib-tests
index 7225c65b8b..f7184bb4e1 100644
--- a/modules/stdlib-tests
+++ b/modules/stdlib-tests
@@ -3,7 +3,7 @@ tests/test-stdlib.c
 tests/test-sys_wait.h
 
 Depends-on:
-verify
+assert-h
 stdlib-c++-tests
 
 configure.ac:
diff --git a/modules/strerror b/modules/strerror
index 6ed290e929..acd17dee0a 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -7,10 +7,10 @@ m4/strerror.m4
 
 Depends-on:
 string
+assert-h         [test $REPLACE_STRERROR = 1]
 errno            [test $REPLACE_STRERROR = 1]
 intprops         [test $REPLACE_STRERROR = 1]
 strerror-override [test $REPLACE_STRERROR = 1]
-verify           [test $REPLACE_STRERROR = 1]
 
 configure.ac:
 gl_FUNC_STRERROR
diff --git a/modules/string-tests b/modules/string-tests
index ec732da6a3..b469c2e048 100644
--- a/modules/string-tests
+++ b/modules/string-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-string.c
 
 Depends-on:
-verify
+assert-h
 string-c++-tests
 
 configure.ac:
diff --git a/modules/strtoimax b/modules/strtoimax
index 80aa1dde65..942fb55a18 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -7,7 +7,7 @@ m4/strtoimax.m4
 
 Depends-on:
 inttypes-incomplete
-verify          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
+assert-h        [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
 stdint          [test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
 strtoll         [{ test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes]
 
diff --git a/modules/strtoumax b/modules/strtoumax
index 3d6bbf7281..5dfdd65ea2 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -8,7 +8,7 @@ m4/strtoumax.m4
 
 Depends-on:
 inttypes-incomplete
-verify          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+assert-h        [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
 stdint          [test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
 strtoull        [{ test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes]
 
diff --git a/modules/sys_stat-tests b/modules/sys_stat-tests
index a5ede77aba..7d4091bd75 100644
--- a/modules/sys_stat-tests
+++ b/modules/sys_stat-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-sys_stat.c
 
 Depends-on:
-verify
+assert-h
 sys_stat-c++-tests
 
 configure.ac:
diff --git a/modules/time-tests b/modules/time-tests
index de7e2383c8..e367565ece 100644
--- a/modules/time-tests
+++ b/modules/time-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-time.c
 
 Depends-on:
-verify
+assert-h
 time-c++-tests
 
 configure.ac:
diff --git a/modules/uchar-tests b/modules/uchar-tests
index 2dab71805b..5df13a09a4 100644
--- a/modules/uchar-tests
+++ b/modules/uchar-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-uchar.c
 
 Depends-on:
-verify
+assert-h
 uchar-c++-tests
 
 configure.ac:
diff --git a/modules/unistd-tests b/modules/unistd-tests
index 9b8222c604..e9ce6e0a3d 100644
--- a/modules/unistd-tests
+++ b/modules/unistd-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-unistd.c
 
 Depends-on:
-verify
+assert-h
 unistd-c++-tests
 
 configure.ac:
diff --git a/modules/unistdio/u16-u16-vasnprintf b/modules/unistdio/u16-u16-vasnprintf
index 9c27ccc7f5..ac8df9f1b1 100644
--- a/modules/unistdio/u16-u16-vasnprintf
+++ b/modules/unistdio/u16-u16-vasnprintf
@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u16-vasnprintf b/modules/unistdio/u16-vasnprintf
index 285640b6ea..e767f54bd3 100644
--- a/modules/unistdio/u16-vasnprintf
+++ b/modules/unistdio/u16-vasnprintf
@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u32-u32-vasnprintf b/modules/unistdio/u32-u32-vasnprintf
index c4fe86d61d..86e669723b 100644
--- a/modules/unistdio/u32-u32-vasnprintf
+++ b/modules/unistdio/u32-u32-vasnprintf
@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u32-vasnprintf b/modules/unistdio/u32-vasnprintf
index a7582ff922..58185bc34b 100644
--- a/modules/unistdio/u32-vasnprintf
+++ b/modules/unistdio/u32-vasnprintf
@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u8-u8-vasnprintf b/modules/unistdio/u8-u8-vasnprintf
index a583f3442d..63ab8d8768 100644
--- a/modules/unistdio/u8-u8-vasnprintf
+++ b/modules/unistdio/u8-u8-vasnprintf
@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/u8-vasnprintf b/modules/unistdio/u8-vasnprintf
index 3fdaa9ce38..f6be0a5de3 100644
--- a/modules/unistdio/u8-vasnprintf
+++ b/modules/unistdio/u8-vasnprintf
@@ -47,7 +47,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf
index 5691007019..61107fe13a 100644
--- a/modules/unistdio/ulc-vasnprintf
+++ b/modules/unistdio/ulc-vasnprintf
@@ -45,7 +45,7 @@ errno
 free-posix
 memchr
 multiarch
-verify
+assert-h
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
diff --git a/modules/utimecmp b/modules/utimecmp
index dffe861c2d..af6b8c2898 100644
--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -16,7 +16,7 @@ utimensat
 intprops
 stdbool
 stdint
-verify
+assert-h
 
 configure.ac:
 gl_UTIMECMP
diff --git a/modules/vasnprintf b/modules/vasnprintf
index bcde2b9cfd..7d40973cdb 100644
--- a/modules/vasnprintf
+++ b/modules/vasnprintf
@@ -30,7 +30,7 @@ stdint
 xsize
 errno
 memchr
-verify
+assert-h
 wchar
 
 configure.ac:
diff --git a/modules/wchar-tests b/modules/wchar-tests
index afe3bff752..3e6b6cf3f7 100644
--- a/modules/wchar-tests
+++ b/modules/wchar-tests
@@ -2,7 +2,7 @@ Files:
 tests/test-wchar.c
 
 Depends-on:
-verify
+assert-h
 wchar-c++-tests
 
 configure.ac: