diff --git a/lib/eventlog/eventlog.c b/lib/eventlog/eventlog.c
index 4621487d6..5a9d74774 100644
--- a/lib/eventlog/eventlog.c
+++ b/lib/eventlog/eventlog.c
@@ -349,7 +349,7 @@ closefrom_nodebug(int lowfd)
 
 #define MAX_MAILFLAGS	63
 
-static sudo_noreturn void
+sudo_noreturn static void
 exec_mailer(int pipein)
 {
     const struct eventlog_config *evl_conf = eventlog_getconf();
diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index a6f17e9c8..589b0b9c7 100644
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -87,8 +87,6 @@ static struct option long_opts[] = {
 };
 
 sudo_dso_public int main(int argc, char *argv[]);
-static sudo_noreturn void help(void);
-static sudo_noreturn void usage(void);
 static bool convert_sudoers_sudoers(struct sudoers_parse_tree *parse_tree, const char *output_file, struct cvtsudoers_config *conf);
 static bool parse_sudoers(const char *input_file, struct cvtsudoers_config *conf);
 static bool parse_ldif(struct sudoers_parse_tree *parse_tree, const char *input_file, struct cvtsudoers_config *conf);
@@ -101,6 +99,8 @@ static void filter_userspecs(struct sudoers_parse_tree *parse_tree, struct cvtsu
 static void filter_defaults(struct sudoers_parse_tree *parse_tree, struct cvtsudoers_config *conf);
 static void alias_remove_unused(struct sudoers_parse_tree *parse_tree);
 static void alias_prune(struct sudoers_parse_tree *parse_tree, struct cvtsudoers_config *conf);
+sudo_noreturn static void help(void);
+sudo_noreturn static void usage(void);
 
 int
 main(int argc, char *argv[])
diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index f7c3743c3..0c04afe5a 100644
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -175,8 +175,6 @@ extern time_t get_date(char *);
 static int list_sessions(int, char **, const char *, const char *, const char *);
 static int parse_expr(struct search_node_list *, char **, bool);
 static void read_keyboard(int fd, int what, void *v);
-static sudo_noreturn void help(void);
-static sudo_noreturn void usage(void);
 static int replay_session(int iolog_dir_fd, const char *iolog_dir,
     struct timespec *offset, struct timespec *max_wait, const char *decimal,
     bool interactive, bool suspend_wait);
@@ -184,6 +182,8 @@ static void sudoreplay_cleanup(void);
 static void write_output(int fd, int what, void *v);
 static void restore_terminal_size(void);
 static void setup_terminal(struct eventlog *evlog, bool interactive, bool resize);
+sudo_noreturn static void help(void);
+sudo_noreturn static void usage(void);
 
 #define VALID_ID(s) (isalnum((unsigned char)(s)[0]) && \
     isalnum((unsigned char)(s)[1]) && isalnum((unsigned char)(s)[2]) && \
diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 3af5636d9..ecc80820f 100644
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -61,12 +61,12 @@ enum sudoers_formats {
  * Function Prototypes
  */
 static void dump_sudoers(struct sudo_lbuf *lbuf);
-static sudo_noreturn void usage(void);
 static void set_runaspw(const char *);
 static void set_runasgr(const char *);
 static bool cb_runas_default(const char *file, int line, int column, const union sudo_defs_val *, int);
 static int testsudoers_error(const char *msg);
 static int testsudoers_output(const char *buf);
+sudo_noreturn static void usage(void);
 
 /* testsudoers_pwutil.c */
 extern struct cache_item *testsudoers_make_gritem(gid_t gid, const char *group);
diff --git a/plugins/sudoers/tsdump.c b/plugins/sudoers/tsdump.c
index db15f7b63..abe56e813 100644
--- a/plugins/sudoers/tsdump.c
+++ b/plugins/sudoers/tsdump.c
@@ -50,10 +50,10 @@ union timestamp_entry_storage {
 
 sudo_dso_public int main(int argc, char *argv[]);
 
-static sudo_noreturn void usage(void);
 static void dump_entry(struct timestamp_entry *entry, off_t pos);
 static bool valid_entry(union timestamp_entry_storage *u, off_t pos);
 static bool convert_entry(union timestamp_entry_storage *record, struct timespec *off);
+sudo_noreturn static void usage(void);
 
 /*
  * tsdump: a simple utility to dump the contents of a time stamp file.
diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 19ecaf687..82f7f9e56 100644
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -96,9 +96,9 @@ static bool reparse_sudoers(char *, int, char **, bool, bool);
 static int run_command(const char *, char *const *);
 static void parse_sudoers_options(void);
 static void setup_signals(void);
-static sudo_noreturn void help(void);
-static sudo_noreturn void usage(void);
 static void visudo_cleanup(void);
+sudo_noreturn static void help(void);
+sudo_noreturn static void usage(void);
 
 extern void get_hostname(void);
 
diff --git a/src/parse_args.c b/src/parse_args.c
index 56f207e8f..d5aed095c 100644
--- a/src/parse_args.c
+++ b/src/parse_args.c
@@ -47,9 +47,9 @@ int tgetpass_flags;
 /*
  * Local functions.
  */
-static sudo_noreturn void help(void);
-static sudo_noreturn void usage_excl(void);
-static sudo_noreturn void usage_excl_ticket(void);
+sudo_noreturn static void help(void);
+sudo_noreturn static void usage_excl(void);
+sudo_noreturn static void usage_excl_ticket(void);
 
 /*
  * Mapping of command line flags to name/value settings.
diff --git a/src/regress/noexec/check_noexec.c b/src/regress/noexec/check_noexec.c
index 4e0a402e8..bad25e09c 100644
--- a/src/regress/noexec/check_noexec.c
+++ b/src/regress/noexec/check_noexec.c
@@ -179,7 +179,7 @@ try_wordexp(void)
 }
 #endif
 
-static sudo_noreturn void
+sudo_noreturn static void
 usage(void)
 {
     fprintf(stderr, "usage: %s [-v] rexec | /path/to/sudo_noexec.so\n",