misc: consolidate macro style USAGE_HELP_OPTIONS

changed in include/c.h and applied via sed:

  sed -i 's/fprintf.*\(USAGE_MAN_TAIL.*\)/printf(\1/' $(git ls-files -- "*.c")
  sed -i 's/print_usage_help_options\(.*\);/printf(USAGE_HELP_OPTIONS\1);/' $(git ls-files -- "*.c")

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

111 files changed, 204 insertions, 206 deletions

diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c
index c97ad46bc..ddac4e67a 100644
--- a/Documentation/boilerplate.c
+++ b/Documentation/boilerplate.c
@@ -56,8 +56,8 @@ static void __attribute__((__noreturn__)) usage(void)
 		"                           consecutive lines are intended by two spaces\n"), out);
 	fputs(_(" -f, --foobar            next option description resets indent\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25); /* char offset to align option descriptions */
-	fprintf(out, USAGE_MAN_TAIL("fixme-command-name(1)"));
+	printf(USAGE_HELP_OPTIONS(25)); /* char offset to align option descriptions */
+	printf(USAGE_MAN_TAIL("fixme-command-name(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c
index e793ae03f..018c99585 100644
--- a/disk-utils/addpart.c
+++ b/disk-utils/addpart.c
@@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Tell the kernel about the existence of a specified partition.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("addpart(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("addpart(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index 976d41628..f1ea53347 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -197,7 +197,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	puts(  _(" -v             verbose mode"));
 	puts(  _("     --report   print report for specified (or all) devices"));
 	fputs(USAGE_SEPARATOR, stdout);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 
 	fputs(USAGE_SEPARATOR, stdout);
 	puts(  _("Available commands:"));
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 6bacc60f3..00c512e49 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2559,9 +2559,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -z, --zero               start with zeroed partition table\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 
-	fprintf(out, USAGE_MAN_TAIL("cfdisk(8)"));
+	printf(USAGE_MAN_TAIL("cfdisk(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c
index 83cd1ce46..dc069970d 100644
--- a/disk-utils/delpart.c
+++ b/disk-utils/delpart.c
@@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Tell the kernel to forget about a specified partition.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("delpart(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("delpart(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index f84b84733..f461c82e1 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -156,8 +156,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -n, --no-verify   disable the verification after the format\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(19);
-	fprintf(out, USAGE_MAN_TAIL("fdformat(8)"));
+	printf(USAGE_HELP_OPTIONS(19));
+	printf(USAGE_MAN_TAIL("fdformat(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index 937304c7e..56c8d63ac 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -785,11 +785,11 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -S, --sectors <number>        specify the number of sectors per track\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(31);
+	printf(USAGE_HELP_OPTIONS(31));
 
 	list_available_columns(out);
 
-	fprintf(out, USAGE_MAN_TAIL("fdisk(8)"));
+	printf(USAGE_MAN_TAIL("fdisk(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 3fe3959c1..58fd8ac59 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -1398,7 +1398,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	printf( "     --version  %s\n", USAGE_OPTSTR_VERSION);
 	fputs(USAGE_SEPARATOR, out);
 	fputs(_("See the specific fsck.* commands for available fs-options."), out);
-	fprintf(out, USAGE_MAN_TAIL("fsck(8)"));
+	printf(USAGE_MAN_TAIL("fsck(8)"));
 	exit(FSCK_EX_OK);
 }
 
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 465685278..50c7d33b9 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -120,7 +120,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -b, --blocksize <size>   use this blocksize, defaults to page size\n"), out);
 	fputs(_("     --extract[=<dir>]    test uncompression, optionally extract into <dir>\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 
 	printf(USAGE_MAN_TAIL("fsck.cramfs(8)"));
 	exit(FSCK_EX_OK);
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index a96f77f6f..b978684a8 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -192,8 +192,8 @@ usage(void) {
 	fputs(_(" -m, --uncleared  activate mode not cleared warnings\n"), out);
 	fputs(_(" -f, --force      force check\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(18);
-	fprintf(out, USAGE_MAN_TAIL("fsck.minix(8)"));
+	printf(USAGE_HELP_OPTIONS(18));
+	printf(USAGE_MAN_TAIL("fsck.minix(8)"));
 	exit(FSCK_EX_OK);
 }
 
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 2b2e1ee66..5fbbbfc76 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -141,8 +141,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -d, --divisor=<number>  divide the amount of bytes by <number>\n"), out);
 	fputs(_(" -x, --sectors           show sector count and size\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
-	fprintf(out, USAGE_MAN_TAIL("isosize(8)"));
+	printf(USAGE_HELP_OPTIONS(25));
+	printf(USAGE_MAN_TAIL("isosize(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index fbf2887ca..5bf8fdfd8 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -85,9 +85,9 @@ static void __attribute__((__noreturn__)) usage(void)
 		       " -c                  this option is silently ignored\n"
 		       " -l                  this option is silently ignored\n"
 		       ));
-	print_usage_help_options(21);
+	printf(USAGE_HELP_OPTIONS(21));
 
-	fprintf(out, USAGE_MAN_TAIL("mkfs.bfs(8)"));
+	printf(USAGE_MAN_TAIL("mkfs.bfs(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index f7b0c0a09..5bcd9613c 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -55,9 +55,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fprintf(out, _("     <size>         number of blocks to be used on the device\n"));
 	fprintf(out, _(" -V, --verbose      explain what is being done;\n"
 		       "                      specifying -V more than once will cause a dry-run\n"));
-	print_usage_help_options(20);
+	printf(USAGE_HELP_OPTIONS(20));
 
-	fprintf(out, USAGE_MAN_TAIL("mkfs(8)"));
+	printf(USAGE_MAN_TAIL("mkfs(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index ec83f48da..a3e9aa48c 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -143,7 +143,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		program_invocation_short_name, PAD_SIZE);
 
 	fputs(USAGE_SEPARATOR, stdout);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 	printf(USAGE_MAN_TAIL("mkfs.cramfs(8)"));
 	exit(MKFS_EX_OK);
 }
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index e77d0b89f..54c47da7e 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -145,8 +145,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -c, --check             check the device for bad blocks\n"), out);
 	fputs(_(" -l, --badblocks <file>  list of bad blocks from file\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
-	fprintf(out, USAGE_MAN_TAIL("mkfs.minix(8)"));
+	printf(USAGE_HELP_OPTIONS(25));
+	printf(USAGE_MAN_TAIL("mkfs.minix(8)"));
 	exit(MKFS_EX_OK);
 }
 
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 593a61e03..748e241cf 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -161,7 +161,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -v, --swapversion NUM     specify swap-space version number\n"
 		" -U, --uuid UUID           specify the uuid to use\n"
 		));
-	print_usage_help_options(27);
+	printf(USAGE_HELP_OPTIONS(27));
 
 	printf(USAGE_MAN_TAIL("mkswap(8)"));
 	exit(EXIT_SUCCESS);
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 474c80e46..43a6448db 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -773,13 +773,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose        verbose mode\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
+	printf(USAGE_HELP_OPTIONS(22));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < NCOLS; i++)
 		fprintf(out, " %10s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("partx(8)"));
+	printf(USAGE_MAN_TAIL("partx(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index 1de7f813e..8abcbb747 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -59,8 +59,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -q, --query    set query mode\n"), out);
 	fputs(_(" -a, --all      query all raw devices\n"), out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("raw(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("raw(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c
index 38e7cacea..15aa01b8f 100644
--- a/disk-utils/resizepart.c
+++ b/disk-utils/resizepart.c
@@ -24,8 +24,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Tell the kernel about the new size of a partition.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("resizepart(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("resizepart(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 8616ee950..c3a97a479 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1906,7 +1906,7 @@ static void __attribute__((__noreturn__)) usage(void)
 
 	list_available_columns(out);
 
-	fprintf(out, USAGE_MAN_TAIL("sfdisk(8)"));
+	printf(USAGE_MAN_TAIL("sfdisk(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index c4e6873c0..7785bcebc 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -125,8 +125,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -L, --label <label> specify a new label\n"
 		" -U, --uuid <uuid>   specify a new uuid\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(21);
-	fprintf(out, USAGE_MAN_TAIL("swaplabel(8)"));
+	printf(USAGE_HELP_OPTIONS(21));
+	printf(USAGE_MAN_TAIL("swaplabel(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/include/c.h b/include/c.h
index fc766e069..119a127e3 100644
--- a/include/c.h
+++ b/include/c.h
@@ -319,13 +319,11 @@ static inline int xusleep(useconds_t usec)
 #define USAGE_OPTSTR_HELP     _("display this help")
 #define USAGE_OPTSTR_VERSION  _("print version")
 
-#define print_usage_help_options(marg_dsc) \
-	printf( \
+#define USAGE_HELP_OPTIONS(marg_dsc) \
 		"%-" #marg_dsc "s%s\n" \
 		"%-" #marg_dsc "s%s\n" \
 		, " -h, --help",    USAGE_OPTSTR_HELP \
-		, " -V, --version", USAGE_OPTSTR_VERSION \
-	)
+		, " -V, --version", USAGE_OPTSTR_VERSION
 
 #define USAGE_MAN_TAIL(_man)   _("\nFor more details see %s.\n"), _man
 
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 7d14e7b4c..c5312fa0c 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -106,7 +106,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(USAGE_SEPARATOR, fp);
 	printf( " -u, --help                   %s\n", USAGE_OPTSTR_HELP);
 	printf( " -v, --version                %s\n", USAGE_OPTSTR_VERSION);
-	fprintf(fp, USAGE_MAN_TAIL("chfn(1)"));
+	printf(USAGE_MAN_TAIL("chfn(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 9b19b84f0..4721c870e 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -85,7 +85,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(USAGE_SEPARATOR, fp);
 	printf( " -u, --help           %s\n", USAGE_OPTSTR_HELP);
 	printf( " -v, --version        %s\n", USAGE_OPTSTR_VERSION);
-	fprintf(fp, USAGE_MAN_TAIL("chsh(1)"));
+	printf(USAGE_MAN_TAIL("chsh(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/login-utils/last.c b/login-utils/last.c
index 1218a3018..ae0d4c9c7 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -589,8 +589,8 @@ static void __attribute__((__noreturn__)) usage(const struct last_control *ctl)
 		"                               notime|short|full|iso\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
-	fprintf(out, USAGE_MAN_TAIL("last(1)"));
+	printf(USAGE_HELP_OPTIONS(22));
+	printf(USAGE_MAN_TAIL("last(1)"));
 
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index 8b9933eb7..186ec6cbd 100644
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1253,13 +1253,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --wtmp-file <path>   set an alternate path for wtmp\n"), out);
 	fputs(_("     --btmp-file <path>   set an alternate path for btmp\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(coldescs); i++)
 		fprintf(out, " %14s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lslogins(1)"));
+	printf(USAGE_MAN_TAIL("lslogins(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index ce3fefbc1..7358ba112 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -176,8 +176,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Log in to a new group.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("newgrp(1)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("newgrp(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/login-utils/nologin.c b/login-utils/nologin.c
index 44604dc77..b0b6a721c 100644
--- a/login-utils/nologin.c
+++ b/login-utils/nologin.c
@@ -30,9 +30,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Politely refuse a login.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 
-	fprintf(out, USAGE_MAN_TAIL("nologin(8)"));
+	printf(USAGE_MAN_TAIL("nologin(8)"));
 	exit(EXIT_FAILURE);
 }
 
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index 574d98e22..314f60abe 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -709,7 +709,7 @@ usage(void)
   fputs (_(" -s, --shell <shell>             run <shell> if /etc/shells allows it\n"), stdout);
 
   fputs(USAGE_SEPARATOR, stdout);
-  print_usage_help_options(33);
+  printf(USAGE_HELP_OPTIONS(33));
   printf(USAGE_MAN_TAIL(su_mode == SU_MODE ? "su(1)" : "runuser(1)"));
   exit(EXIT_SUCCESS);
 }
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 45f6cfa4c..49b949a90 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -812,8 +812,8 @@ static void usage(void)
 		out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
-	fprintf(out, USAGE_MAN_TAIL("sulogin(8)"));
+	printf(USAGE_HELP_OPTIONS(26));
+	printf(USAGE_MAN_TAIL("sulogin(8)"));
 }
 
 int main(int argc, char **argv)
diff --git a/login-utils/utmpdump.c b/login-utils/utmpdump.c
index 41d6c3b1a..00c44b8db 100644
--- a/login-utils/utmpdump.c
+++ b/login-utils/utmpdump.c
@@ -311,9 +311,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -f, --follow         output appended data as the file grows\n"), out);
 	fputs(_(" -r, --reverse        write back dumped data into utmp file\n"), out);
 	fputs(_(" -o, --output <file>  write to file instead of standard output\n"), out);
-	print_usage_help_options(22);
+	printf(USAGE_HELP_OPTIONS(22));
 
-	fprintf(out, USAGE_MAN_TAIL("utmpdump(1)"));
+	printf(USAGE_MAN_TAIL("utmpdump(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index e5614af65..5999d8d15 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -306,8 +306,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Edit the password or group file.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("vipw(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("vipw(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 3aa2ee5a6..4cd85317f 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -103,8 +103,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(	" -n, --match-types <list>   filter by filesystem type (e.g. -n vfat,ext3)\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(28);
-	fprintf(out, USAGE_MAN_TAIL("blkid(8)"));
+	printf(USAGE_HELP_OPTIONS(28));
+	printf(USAGE_MAN_TAIL("blkid(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 870fa689b..98bdff681 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -1015,8 +1015,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	        "                         %s\n", USAGE_COLORS_DEFAULT);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(23);
-	fprintf(out, USAGE_MAN_TAIL("cal(1)"));
+	printf(USAGE_HELP_OPTIONS(23));
+	printf(USAGE_MAN_TAIL("cal(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c
index 9ef912758..f1596a736 100644
--- a/misc-utils/fincore.c
+++ b/misc-utils/fincore.c
@@ -274,14 +274,14 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --raw             use raw output format\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(23);
+	printf(USAGE_HELP_OPTIONS(23));
 
 	fprintf(out, USAGE_COLUMNS);
 
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("fincore(1)"));
+	printf(USAGE_MAN_TAIL("fincore(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c
index fc16e44e6..99ad354fa 100644
--- a/misc-utils/findfs.c
+++ b/misc-utils/findfs.c
@@ -33,8 +33,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Find a filesystem by label or UUID.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("findfs(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("findfs(8)"));
 	exit(FINDFS_SUCCESS);
 }
 
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 521942500..184b6f7d7 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1245,13 +1245,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --verbose          print more details\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("findmnt(8)"));
+	printf(USAGE_MAN_TAIL("findmnt(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 8150e3c03..9b4f35279 100644
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -346,7 +346,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -T, --test                    test for getopt(1) version\n"), stdout);
 	fputs(_(" -u, --unquoted                do not quote the output\n"), stdout);
 	fputs(USAGE_SEPARATOR, stdout);
-	print_usage_help_options(31);
+	printf(USAGE_HELP_OPTIONS(31));
 	printf(USAGE_MAN_TAIL("getopt(1)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 0778c6fad..128c092f2 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -318,8 +318,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --verbose          print pids that will be signaled\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
-	fprintf(out, USAGE_MAN_TAIL("kill(1)"));
+	printf(USAGE_HELP_OPTIONS(24));
+	printf(USAGE_MAN_TAIL("kill(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 1ef60bb76..f6fb350cc 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -1027,8 +1027,8 @@ static void __attribute__((__noreturn__)) usage(void)
 #endif
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
-	fprintf(out, USAGE_MAN_TAIL("logger(1)"));
+	printf(USAGE_HELP_OPTIONS(26));
+	printf(USAGE_MAN_TAIL("logger(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/look.c b/misc-utils/look.c
index dfb77319b..60fbbbfca 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -365,8 +365,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --terminate <char>   define the string-termination character\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
-	fprintf(out, USAGE_MAN_TAIL("look(1)"));
+	printf(USAGE_HELP_OPTIONS(26));
+	printf(USAGE_MAN_TAIL("look(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 983804b9c..9d3460b43 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1658,14 +1658,14 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --topology       output info about topology\n"), out);
 	fputs(_(" -x, --sort <column>  sort output by <column>\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
+	printf(USAGE_HELP_OPTIONS(22));
 
 	fprintf(out, USAGE_COLUMNS);
 
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lsblk(8)"));
+	printf(USAGE_MAN_TAIL("lsblk(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index d872e2dc7..24c6d6324 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -507,14 +507,14 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -u, --notruncate       don't truncate text in columns\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
 	fputs(USAGE_COLUMNS, out);
 
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lslocks(8)"));
+	printf(USAGE_MAN_TAIL("lslocks(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index ce9c4bf44..e6c799d24 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -91,8 +91,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose         explain what is being done\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(23);
-	fprintf(out, USAGE_MAN_TAIL("mcookie(1)"));
+	printf(USAGE_HELP_OPTIONS(23));
+	printf(USAGE_MAN_TAIL("mcookie(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 92ee22e1f..e2dbd0bf2 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -343,9 +343,9 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -l, --long          use a long listing format (-m -o -v) \n"
 		" -n, --nosymlinks    don't follow symlinks\n"
 		" -v, --vertical      vertical align of modes and owners\n"), out);
-	print_usage_help_options(21);
+	printf(USAGE_HELP_OPTIONS(21));
 
-	fprintf(out, USAGE_MAN_TAIL("namei(1)"));
+	printf(USAGE_MAN_TAIL("namei(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index f5029836a..7c3cdf67d 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -144,8 +144,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -n, --no-act        do not make any changes\n"), out);
 	fputs(_(" -o, --no-overwrite  don't overwrite existing files\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(21);
-	fprintf(out, USAGE_MAN_TAIL("rename(1)"));
+	printf(USAGE_HELP_OPTIONS(21));
+	printf(USAGE_MAN_TAIL("rename(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 492ad83d9..2cfb383f0 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -79,8 +79,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -d, --debug             run in debugging mode\n"), out);
 	fputs(_(" -q, --quiet             turn on quiet mode\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
-	fprintf(out, USAGE_MAN_TAIL("uuidd(8)"));
+	printf(USAGE_HELP_OPTIONS(25));
+	printf(USAGE_MAN_TAIL("uuidd(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 8252fd528..e33e43bf0 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -32,8 +32,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --random     generate random-based uuid\n"), out);
 	fputs(_(" -t, --time       generate time-based uuid\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(18);
-	fprintf(out, USAGE_MAN_TAIL("uuidgen(1)"));
+	printf(USAGE_HELP_OPTIONS(18));
+	printf(USAGE_MAN_TAIL("uuidgen(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/uuidparse.c b/misc-utils/uuidparse.c
index 7618f43d2..49225ae2c 100644
--- a/misc-utils/uuidparse.c
+++ b/misc-utils/uuidparse.c
@@ -103,13 +103,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	puts(_(" -n, --noheadings       don't print headings"));
 	puts(_(" -o, --output <list>    COLUMNS to display (see below)"));
 	puts(_(" -r, --raw              use the raw output format"));
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
 	fputs(USAGE_COLUMNS, stdout);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(stdout, " %8s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(stdout, USAGE_MAN_TAIL("uuidparse(1)"));
+	printf(USAGE_MAN_TAIL("uuidparse(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index b4291c4e8..bac158d46 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -205,8 +205,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -l         output effective lookup paths\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("whereis(1)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("whereis(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index fefbcb5e9..e01fa0c25 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -625,13 +625,13 @@ usage(void)
 	puts(_(" -q, --quiet         suppress output messages"));
 	puts(_(" -t, --types <list>  limit the set of filesystem, RAIDs or partition tables"));
 
-	print_usage_help_options(21);
+	printf(USAGE_HELP_OPTIONS(21));
 
 	fputs(USAGE_COLUMNS, stdout);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(stdout, " %8s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(stdout, USAGE_MAN_TAIL("wipefs(8)"));
+	printf(USAGE_MAN_TAIL("wipefs(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index fbe20e160..a76987737 100644
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -165,9 +165,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose        display status information\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
+	printf(USAGE_HELP_OPTIONS(22));
 
-	fprintf(out, USAGE_MAN_TAIL("chrt(1)"));
+	printf(USAGE_MAN_TAIL("chrt(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/schedutils/ionice.c b/schedutils/ionice.c
index 098fb255e..671c245b8 100644
--- a/schedutils/ionice.c
+++ b/schedutils/ionice.c
@@ -121,9 +121,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -u, --uid <uid>...     act on already running processes owned by these users\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
-	fprintf(out, USAGE_MAN_TAIL("ionice(1)"));
+	printf(USAGE_MAN_TAIL("ionice(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/schedutils/taskset.c b/schedutils/taskset.c
index ca1734f7a..4d7fa1e91 100644
--- a/schedutils/taskset.c
+++ b/schedutils/taskset.c
@@ -62,7 +62,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -p, --pid               operate on existing given pid\n"
 		" -c, --cpu-list          display and specify cpus in list format\n"
 		));
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
 	fputs(USAGE_SEPARATOR, out);
 	fprintf(out, _(
@@ -78,7 +78,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"),
 		program_invocation_short_name);
 
-	fprintf(out, USAGE_MAN_TAIL("taskset(1)"));
+	printf(USAGE_MAN_TAIL("taskset(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index d078f297b..c19b67bf4 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -96,9 +96,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose       print aligned length and offset\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(21);
+	printf(USAGE_HELP_OPTIONS(21));
 
-	fprintf(out, USAGE_MAN_TAIL("blkdiscard(8)"));
+	printf(USAGE_MAN_TAIL("blkdiscard(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c
index 28038f071..6d837ff28 100644
--- a/sys-utils/blkzone.c
+++ b/sys-utils/blkzone.c
@@ -311,9 +311,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -c, --count <number>   maximum number of zones\n"), out);
 	fputs(_(" -v, --verbose          display more details\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
-	fprintf(out, USAGE_MAN_TAIL("blkzone(8)"));
+	printf(USAGE_MAN_TAIL("blkzone(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
index 620aabfba..12e52d887 100644
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -251,7 +251,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -p, --dispatch <mode>         set dispatching mode\n"
 		" -r, --rescan                  trigger rescan of cpus\n"
 		), stdout);
-	print_usage_help_options(31);
+	printf(USAGE_HELP_OPTIONS(31));
 
 	printf(USAGE_MAN_TAIL("chcpu(8)"));
 	exit(EXIT_SUCCESS);
diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c
index b0060ae25..d9bc95cc1 100644
--- a/sys-utils/chmem.c
+++ b/sys-utils/chmem.c
@@ -249,9 +249,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -b, --blocks   use memory blocks\n"), out);
 	fputs(_(" -v, --verbose  verbose output\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 
-	fprintf(out, USAGE_MAN_TAIL("chmem(8)"));
+	printf(USAGE_MAN_TAIL("chmem(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index 6b3f38f56..22814587f 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -31,8 +31,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fprintf(out, _("Set the function of the Ctrl-Alt-Del combination.\n"));
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("ctrlaltdel(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("ctrlaltdel(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index ef12567c3..36d238f01 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -306,7 +306,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		"                               [delta|reltime|ctime|notime|iso]\n"
 		"Suspending/resume will make ctime and iso timestamps inaccurate.\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(29);
+	printf(USAGE_HELP_OPTIONS(29));
 	fputs(_("\nSupported log facilities:\n"), out);
 	for (i = 0; i < ARRAY_SIZE(level_names); i++)
 		fprintf(out, " %7s - %s\n",
@@ -319,7 +319,7 @@ static void __attribute__((__noreturn__)) usage(void)
 			level_names[i].name,
 			_(level_names[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("dmesg(1)"));
+	printf(USAGE_MAN_TAIL("dmesg(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index f1d4474eb..aa90ff72f 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -159,10 +159,10 @@ static void __attribute__((__noreturn__)) usage(void)
 		out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(29);
+	printf(USAGE_HELP_OPTIONS(29));
 
 	fputs(_("\nBy default tries -r, -s, -f, and -q in order until success.\n"), out);
-	fprintf(out, USAGE_MAN_TAIL("eject(1)"));
+	printf(USAGE_MAN_TAIL("eject(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index d5dd9f7e1..c8b2b2fcc 100644
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -101,9 +101,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose        verbose mode\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
+	printf(USAGE_HELP_OPTIONS(22));
 
-	fprintf(out, USAGE_MAN_TAIL("fallocate(1)"));
+	printf(USAGE_MAN_TAIL("fallocate(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 170f96771..ed25230b9 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -70,7 +70,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(  " -F, --no-fork            execute command without forking\n"), stdout);
 	fputs(_(  "     --verbose            increase verbosity\n"), stdout);
 	fputs(USAGE_SEPARATOR, stdout);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 	printf(USAGE_MAN_TAIL("flock(1)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c
index 487759220..401ab5c98 100644
--- a/sys-utils/fsfreeze.c
+++ b/sys-utils/fsfreeze.c
@@ -47,8 +47,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -f, --freeze      freeze the filesystem\n"), out);
 	fputs(_(" -u, --unfreeze    unfreeze the filesystem\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(19);
-	fprintf(out, USAGE_MAN_TAIL("fsfreeze(8)"));
+	printf(USAGE_HELP_OPTIONS(19));
+	printf(USAGE_MAN_TAIL("fsfreeze(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 56a145066..387f260fd 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -262,8 +262,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose       print number of discarded bytes\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(21);
-	fprintf(out, USAGE_MAN_TAIL("fstrim(8)"));
+	printf(USAGE_HELP_OPTIONS(21));
+	printf(USAGE_MAN_TAIL("fstrim(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index a0a48dd13..a9d3887ca 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1242,8 +1242,8 @@ usage(const struct hwclock_control *ctl)
 	fputs(_("     --test           dry run; use -D to view what would have happened\n"), out);
 	fputs(_(" -D, --debug          use debug mode\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
-	fprintf(out, USAGE_MAN_TAIL("hwclock(8)"));
+	printf(USAGE_HELP_OPTIONS(22));
+	printf(USAGE_MAN_TAIL("hwclock(8)"));
 	hwclock_exit(ctl, EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c
index c7b4a83ee..df836525a 100644
--- a/sys-utils/ipcmk.c
+++ b/sys-utils/ipcmk.c
@@ -76,8 +76,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -p, --mode <mode>        permission for the resource (default is 0644)\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
-	fprintf(out, USAGE_MAN_TAIL("ipcmk(1)"));
+	printf(USAGE_HELP_OPTIONS(26));
+	printf(USAGE_MAN_TAIL("ipcmk(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index c1c8de25a..a9f2d1b9a 100644
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -65,8 +65,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose              explain what is being done\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(28);
-	fprintf(out, USAGE_MAN_TAIL("ipcrm(1)"));
+	printf(USAGE_HELP_OPTIONS(28));
+	printf(USAGE_MAN_TAIL("ipcrm(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index e63f10afe..73cf28ab1 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -58,7 +58,7 @@ static void __attribute__((__noreturn__)) usage(void)
 
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -i, --id <id>  print details on resource identified by <id>\n"), out);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 
 	fputs(USAGE_SEPARATOR, out);
 	fputs(_("Resource options:\n"), out);
@@ -76,7 +76,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -u, --summary     show status summary\n"), out);
 	fputs(_("     --human       show sizes in human-readable format\n"), out);
 	fputs(_(" -b, --bytes       show sizes in bytes\n"), out);
-	fprintf(out, USAGE_MAN_TAIL("ipcs(1)"));
+	printf(USAGE_MAN_TAIL("ipcs(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 3c6b4aad6..eb04b5e33 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -213,7 +213,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -i, --iflag [-]<iflag>  set input mode flag\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
 	fputs(_("\nKnown <ldisc> names:\n"), out);
 	print_table(out, ld_discs);
@@ -222,7 +222,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("\nKnown <iflag> names:\n"), out);
 	print_table(out, ld_iflags);
 
-	fprintf(out, USAGE_MAN_TAIL("ldattach(8)"));
+	printf(USAGE_MAN_TAIL("ldattach(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index d4740bd94..bbff98389 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -419,13 +419,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --raw                     use raw --list output format\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(31);
+	printf(USAGE_HELP_OPTIONS(31));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %12s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("losetup(8)"));
+	printf(USAGE_MAN_TAIL("losetup(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 852711e74..8b4fe0bcd 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -2065,13 +2065,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -x, --hex               print hexadecimal masks rather than lists of CPUs\n"), out);
 	fputs(_(" -y, --physical          print physical instead of logical IDs\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(coldescs); i++)
 		fprintf(out, " %13s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));
+	printf(USAGE_MAN_TAIL("lscpu(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
index 4bbd8d77b..e99c861ab 100644
--- a/sys-utils/lsipc.c
+++ b/sys-utils/lsipc.c
@@ -304,7 +304,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --time               show attach, detach and change times\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 
 	fprintf(out, _("\nGeneric columns:\n"));
 	for (i = COLDESC_IDX_GEN_FIRST; i <= COLDESC_IDX_GEN_LAST; i++)
@@ -326,7 +326,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	for (i = COLDESC_IDX_SUM_FIRST; i <= COLDESC_IDX_SUM_LAST; i++)
 		fprintf(out, " %14s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lsipc(1)"));
+	printf(USAGE_MAN_TAIL("lsipc(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c
index 4db678966..aeffd29dd 100644
--- a/sys-utils/lsmem.c
+++ b/sys-utils/lsmem.c
@@ -387,13 +387,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --summary[=when] print summary information (never,always or only)\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(22);
+	printf(USAGE_HELP_OPTIONS(22));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(coldescs); i++)
 		fprintf(out, " %10s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lsmem(1)"));
+	printf(USAGE_MAN_TAIL("lsmem(1)"));
 
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index 6ed772c9f..1fb0b87f3 100644
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -627,13 +627,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --type <name>      namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("lsns(8)"));
+	printf(USAGE_MAN_TAIL("lsns(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index e9a581150..83cccf63e 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -426,7 +426,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	" -w, --rw, --read-write  mount the filesystem read-write (default)\n"));
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
 	fprintf(out, _(
 	"\nSource:\n"
@@ -458,7 +458,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	" --make-rprivate         recursively mark a whole subtree as private\n"
 	" --make-runbindable      recursively mark a whole subtree as unbindable\n"));
 
-	fprintf(out, USAGE_MAN_TAIL("mount(8)"));
+	printf(USAGE_MAN_TAIL("mount(8)"));
 
 	exit(MNT_EX_SUCCESS);
 }
diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index 305013851..808cfb9d0 100644
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -127,8 +127,8 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -d, --fs-devno     print maj:min device number of the filesystem\n"
 		" -x, --devno        print maj:min device number of the block device\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(20);
-	fprintf(out, USAGE_MAN_TAIL("mountpoint(1)"));
+	printf(USAGE_HELP_OPTIONS(20));
+	printf(USAGE_MAN_TAIL("mountpoint(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 48932df88..9c452c1d1 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -97,8 +97,8 @@ static void __attribute__((__noreturn__)) usage(void)
 #endif
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
-	fprintf(out, USAGE_MAN_TAIL("nsenter(1)"));
+	printf(USAGE_HELP_OPTIONS(24));
+	printf(USAGE_MAN_TAIL("nsenter(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index bb9aec66b..ea76d94bf 100644
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -38,8 +38,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Change the root filesystem.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("pivot_root(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("pivot_root(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 37e0f9fed..e8d95822e 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -173,7 +173,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		"     --raw              use the raw output format\n"
 		"     --verbose          verbose output\n"
 		), out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
 	fputs(_("\nResources Options:\n"), out);
 	fputs(_(" -c, --core             maximum size of core files created\n"
@@ -198,7 +198,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("prlimit(1)"));
+	printf(USAGE_MAN_TAIL("prlimit(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 7a85ba5ef..035073847 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -122,8 +122,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --reset               reset all the counters (root only)\n"), out);
 	fputs(_(" -n, --no-auto             disable byte order auto-detection\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(27);
-	fprintf(out, USAGE_MAN_TAIL("readprofile(8)"));
+	printf(USAGE_HELP_OPTIONS(27));
+	printf(USAGE_MAN_TAIL("readprofile(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index ca438bbbc..33852b4a8 100644
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -73,8 +73,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -g, --pgrp <id>        interpret argument as process group ID\n"), out);
 	fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
-	fprintf(out, USAGE_MAN_TAIL("renice(1)"));
+	printf(USAGE_HELP_OPTIONS(24));
+	printf(USAGE_MAN_TAIL("renice(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index d02ee17ac..5fe686f5b 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -115,7 +115,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose            verbose messages\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 	printf(USAGE_MAN_TAIL("rtcwake(8)"));
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index 5280a1271..6673825c8 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -114,7 +114,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		fputs(_("     --list               list settable architectures, and exit\n"), stdout);
 
 	fputs(USAGE_SEPARATOR, stdout);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 	printf(USAGE_MAN_TAIL("setarch(8)"));
 
 	exit(EXIT_SUCCESS);
diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index 1e5c0b499..d0123368e 100644
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -139,10 +139,10 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" --apparmor-profile <pr>     set AppArmor profile\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(29);
+	printf(USAGE_HELP_OPTIONS(29));
 	fputs(USAGE_SEPARATOR, out);
 	fputs(_(" This tool can be dangerous.  Read the manpage, and be careful.\n"), out);
-	fprintf(out, USAGE_MAN_TAIL("setpriv(1)"));
+	printf(USAGE_MAN_TAIL("setpriv(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index fddd8a87a..0b1395232 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -40,9 +40,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -c, --ctty     set the controlling terminal to the current one\n"), out);
 	fputs(_(" -w, --wait     wait program to exit, and use the same return\n"), out);
 
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 
-	fprintf(out, USAGE_MAN_TAIL("setsid(1)"));
+	printf(USAGE_MAN_TAIL("setsid(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index e13fb752b..e5e059d74 100644
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -130,7 +130,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -v, --verbose          verbose mode\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
 	fputs(_("\nThe <spec> parameter:\n" \
 		" -L <label>             LABEL of device to be used\n" \
@@ -140,7 +140,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		" <device>               name of device to be used\n" \
 		" <file>                 name of file to be used\n"), out);
 
-	fprintf(out, USAGE_MAN_TAIL("swapoff(8)"));
+	printf(USAGE_MAN_TAIL("swapoff(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 28f3bd8d6..641facb1f 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -808,7 +808,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose            verbose mode\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(26);
+	printf(USAGE_HELP_OPTIONS(26));
 
 	fputs(_("\nThe <spec> parameter:\n" \
 		" -L <label>             synonym for LABEL=<label>\n"
@@ -829,7 +829,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %-5s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("swapon(8)"));
+	printf(USAGE_MAN_TAIL("swapon(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
index 5c4095966..87f178c36 100644
--- a/sys-utils/switch_root.c
+++ b/sys-utils/switch_root.c
@@ -209,8 +209,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Switch to another filesystem as the root of the mount tree.\n"), output);
 
 	fputs(USAGE_OPTIONS, output);
-	print_usage_help_options(16);
-	fprintf(output, USAGE_MAN_TAIL("switch_root(8)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("switch_root(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index a03b9a68a..c6bdc66e9 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -112,8 +112,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --reset                  reset the port\n"), out);
 	fputs(_(" -q, --print-irq <on|off>     display current irq setting\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(30);
-	fprintf(out, USAGE_MAN_TAIL("tunelp(8)"));
+	printf(USAGE_HELP_OPTIONS(30));
+	printf(USAGE_MAN_TAIL("tunelp(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index fd21ca9d7..61d9a33ef 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -102,8 +102,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -v, --verbose           say what is being done\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
-	fprintf(out, USAGE_MAN_TAIL("umount(8)"));
+	printf(USAGE_HELP_OPTIONS(25));
+	printf(USAGE_MAN_TAIL("umount(8)"));
 
 	exit(MNT_EX_SUCCESS);
 }
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 5060c2839..b5e0d6608 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -265,8 +265,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -s, --setgroups allow|deny  control the setgroups syscall in user namespaces\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(27);
-	fprintf(out, USAGE_MAN_TAIL("unshare(1)"));
+	printf(USAGE_HELP_OPTIONS(27));
+	printf(USAGE_MAN_TAIL("unshare(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 1b82fc830..33012dca3 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -190,7 +190,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -x, --flags-only       print only flags table (same as -I -T)\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 	fputs(USAGE_SEPARATOR, out);
 
 	fprintf(out, _("The default device is %s.\n"), _PATH_WATCHDOG_DEV);
@@ -199,7 +199,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %13s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("wdctl(8)"));
+	printf(USAGE_MAN_TAIL("wdctl(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 3d604cf68..aee28cc01 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -543,13 +543,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, --streams <number>    number of compression streams\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(27);
+	printf(USAGE_HELP_OPTIONS(27));
 
 	fputs(USAGE_COLUMNS, out);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-	fprintf(out, USAGE_MAN_TAIL("zramctl(8)"));
+	printf(USAGE_MAN_TAIL("zramctl(8)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 7df5a5268..23cac403e 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2112,7 +2112,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("     --reload               reload prompts on running agetty instances\n"), out);
 	printf( "     --help                 %s\n", USAGE_OPTSTR_HELP);
 	printf( "     --version              %s\n", USAGE_OPTSTR_VERSION);
-	fprintf(out, USAGE_MAN_TAIL("agetty(8)"));
+	printf(USAGE_MAN_TAIL("agetty(8)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/term-utils/mesg.c b/term-utils/mesg.c
index d5a7f2e29..8714ad1aa 100644
--- a/term-utils/mesg.c
+++ b/term-utils/mesg.c
@@ -80,8 +80,8 @@ static void __attribute__((__noreturn__)) usage(void)
 
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -v, --verbose  explain what is being done\n"), out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("mesg(1)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("mesg(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/term-utils/script.c b/term-utils/script.c
index e21affa2b..814ee4961 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -172,9 +172,9 @@ static void __attribute__((__noreturn__)) usage(void)
 		" -q, --quiet             be quiet\n"
 		" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 		), out);
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
-	fprintf(out, USAGE_MAN_TAIL("script(1)"));
+	printf(USAGE_MAN_TAIL("script(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c
index 0a22b9cb8..7b59b6e24 100644
--- a/term-utils/scriptreplay.c
+++ b/term-utils/scriptreplay.c
@@ -53,9 +53,9 @@ usage(void)
 		" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 		" -m, --maxdelay <num>    wait at most this many seconds between updates\n"
 		), out);
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
-	fprintf(out, USAGE_MAN_TAIL("scriptreplay(1)"));
+	printf(USAGE_MAN_TAIL("scriptreplay(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 2878bdb96..f20a5e698 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -421,7 +421,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	printf( " --help                            %s\n", USAGE_OPTSTR_HELP);
 	printf( " --version                         %s\n", USAGE_OPTSTR_VERSION);
 
-	fprintf(out, USAGE_MAN_TAIL("setterm(1)"));
+	printf(USAGE_MAN_TAIL("setterm(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/term-utils/wall.c b/term-utils/wall.c
index 6e48ab9fd..f57c0835c 100644
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -93,8 +93,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -n, --nobanner          do not print banner, works only for root\n"), out);
 	fputs(_(" -t, --timeout <timeout> write timeout in seconds\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
-	fprintf(out, USAGE_MAN_TAIL("wall(1)"));
+	printf(USAGE_HELP_OPTIONS(25));
+	printf(USAGE_MAN_TAIL("wall(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/term-utils/write.c b/term-utils/write.c
index 9f313d8a9..bd64fc281 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -91,8 +91,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Send a message to another user.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("write(1)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("write(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/text-utils/col.c b/text-utils/col.c
index 01ee61b27..3d9e15d26 100644
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -151,7 +151,7 @@ static void __attribute__((__noreturn__)) usage(void)
 		"%s reads from standard input and writes to standard output\n\n"),
 		program_invocation_short_name);
 
-	fprintf(out, USAGE_MAN_TAIL("col(1)"));
+	printf(USAGE_MAN_TAIL("col(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index cb6d4456e..6113880e4 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -89,9 +89,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -2, --half-lines        print all half-lines\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(25);
+	printf(USAGE_HELP_OPTIONS(25));
 
-	fprintf(out, USAGE_MAN_TAIL("colcrt(1)"));
+	printf(USAGE_MAN_TAIL("colcrt(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index c2ff039ff..8bb0ee9cc 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -65,10 +65,10 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Filter out the specified columns.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 	fprintf(out, _("%s reads from standard input and writes to standard output\n\n"),
 		       program_invocation_short_name);
-	fprintf(out, USAGE_MAN_TAIL("colrm(1)"));
+	printf(USAGE_MAN_TAIL("colrm(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/text-utils/column.c b/text-utils/column.c
index fb57b4748..2bb6335cf 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -589,8 +589,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -x, --fillrows                   fill rows before columns\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(34);
-	fprintf(out, USAGE_MAN_TAIL("column(1)"));
+	printf(USAGE_HELP_OPTIONS(34));
+	printf(USAGE_MAN_TAIL("column(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 57deddaf1..94c53b8e5 100644
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -174,8 +174,8 @@ void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -s, --skip <offset>       skip offset bytes from the beginning\n"), out);
 	fputs(_(" -v, --no-squeezing        output identical lines\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(27);
-	fprintf(out, USAGE_MAN_TAIL("hexdump(1)"));
+	printf(USAGE_HELP_OPTIONS(27));
+	printf(USAGE_MAN_TAIL("hexdump(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/text-utils/line.c b/text-utils/line.c
index a9b3696cf..63c001261 100644
--- a/text-utils/line.c
+++ b/text-utils/line.c
@@ -34,8 +34,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Read one line.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("line(1)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("line(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/text-utils/more.c b/text-utils/more.c
index 2a7917120..cbff39b11 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -249,7 +249,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(USAGE_SEPARATOR, out);
 	printf( "     --help     %s\n", USAGE_OPTSTR_HELP);
 	printf( " -V, --version  %s\n", USAGE_OPTSTR_VERSION);
-	fprintf(out, USAGE_MAN_TAIL("more(1)"));
+	printf(USAGE_MAN_TAIL("more(1)"));
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 5c378915a..ed9eb415a 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -247,9 +247,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" +/pattern/   start at the line containing pattern\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(16);
+	printf(USAGE_HELP_OPTIONS(16));
 
-	fprintf(out, USAGE_MAN_TAIL("pg(1)"));
+	printf(USAGE_MAN_TAIL("pg(1)"));
 	exit(0);
 }
 
diff --git a/text-utils/rev.c b/text-utils/rev.c
index 3c2bd1f20..84d116d8c 100644
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -81,8 +81,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Reverse lines characterwise.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	print_usage_help_options(16);
-	fprintf(out, USAGE_MAN_TAIL("rev(1)"));
+	printf(USAGE_HELP_OPTIONS(16));
+	printf(USAGE_MAN_TAIL("rev(1)"));
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/text-utils/ul.c b/text-utils/ul.c
index 8f1f89e46..b5ce4db84 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -148,9 +148,9 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -t, -T, --terminal TERMINAL  override the TERM environment variable\n"), out);
 	fputs(_(" -i, --indicated              underlining is indicated via a separate line\n"), out);
 	fputs(USAGE_SEPARATOR, out);
-	print_usage_help_options(30);
+	printf(USAGE_HELP_OPTIONS(30));
 
-	fprintf(out, USAGE_MAN_TAIL("ul(1)"));
+	printf(USAGE_MAN_TAIL("ul(1)"));
 
 	exit(EXIT_SUCCESS);
 }