diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index a7a02702..4455856b 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -112,7 +112,7 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
 		}
 		next_prompt = prompts;
 	} else
-		next_prompt = prompts = xstrdup (s);
+		next_prompt = prompts = xstrdup(s);
 	if ((s = args_get(args, 'I')) != NULL)
 		next_input = inputs = xstrdup(s);
 	else
diff --git a/cmd-queue.c b/cmd-queue.c
index a12aaf10..633af06b 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -126,7 +126,7 @@ cmdq_new(void)
 {
 	struct cmdq_list	*queue;
 
-	queue = xcalloc (1, sizeof *queue);
+	queue = xcalloc(1, sizeof *queue);
 	TAILQ_INIT (&queue->list);
 	return (queue);
 }
diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index b2665ad9..6b947280 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -185,7 +185,7 @@ cmd_refresh_client_clipboard(struct cmd *self, struct cmdq_item *item)
 		}
 		if (i != tc->clipboard_npanes)
 			return (CMD_RETURN_NORMAL);
-		tc->clipboard_panes = xreallocarray (tc->clipboard_panes,
+		tc->clipboard_panes = xreallocarray(tc->clipboard_panes,
 		    tc->clipboard_npanes + 1, sizeof *tc->clipboard_panes);
 		tc->clipboard_panes[tc->clipboard_npanes++] = fs.wp->id;
 	}
diff --git a/configure.ac b/configure.ac
index 17a1935d..276f71c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], next-3.4) 
+AC_INIT([tmux], next-3.4)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)
diff --git a/format.c b/format.c
index 2e4bceb5..5e04a6a2 100644
--- a/format.c
+++ b/format.c
@@ -2597,7 +2597,7 @@ format_cb_user(__unused struct format_tree *ft)
 
 	if ((pw = getpwuid(getuid())) != NULL)
 		return (xstrdup(pw->pw_name));
-	return NULL;
+	return (NULL);
 }
 
 /* Format table type. */
diff --git a/log.c b/log.c
index d4436672..0e0d1d1a 100644
--- a/log.c
+++ b/log.c
@@ -143,7 +143,7 @@ fatal(const char *msg, ...)
 	va_list	 ap;
 
 	if (snprintf(tmp, sizeof tmp, "fatal: %s: ", strerror(errno)) < 0)
-		exit (1);
+		exit(1);
 
 	va_start(ap, msg);
 	log_vwrite(msg, ap, tmp);
diff --git a/notify.c b/notify.c
index baeb0600..85255857 100644
--- a/notify.c
+++ b/notify.c
@@ -46,7 +46,7 @@ notify_insert_one_hook(struct cmdq_item *item, struct notify_entry *ne,
 	if (log_get_level() != 0) {
 		s = cmd_list_print(cmdlist, 0);
 		log_debug("%s: hook %s is: %s", __func__, ne->name, s);
-		free (s);
+		free(s);
 	}
 	new_item = cmdq_get_command(cmdlist, state);
 	return (cmdq_insert_after(item, new_item));
diff --git a/proc.c b/proc.c
index f0eded99..67ec214a 100644
--- a/proc.c
+++ b/proc.c
@@ -202,7 +202,7 @@ proc_start(const char *name)
 #endif
 	    , event_get_version(), event_get_method()
 #ifdef HAVE_UTF8PROC
-	    , utf8proc_version ()
+	    , utf8proc_version()
 #endif
 	);
 
diff --git a/screen.c b/screen.c
index 62cf4765..eceef642 100644
--- a/screen.c
+++ b/screen.c
@@ -661,9 +661,9 @@ screen_mode_to_string(int mode)
 	static char	tmp[1024];
 
 	if (mode == 0)
-		return "NONE";
+		return ("NONE");
 	if (mode == ALL_MODES)
-		return "ALL";
+		return ("ALL");
 
 	*tmp = '\0';
 	if (mode & MODE_CURSOR)
diff --git a/server-acl.c b/server-acl.c
index 5d9f6223..344f795c 100644
--- a/server-acl.c
+++ b/server-acl.c
@@ -42,8 +42,8 @@ static int
 server_acl_cmp(struct server_acl_user *user1, struct server_acl_user *user2)
 {
 	if (user1->uid < user2->uid)
-		return -1;
-	return user1->uid > user2->uid;
+		return (-1);
+	return (user1->uid > user2->uid);
 }
 
 RB_HEAD(server_acl_entries, server_acl_user) server_acl_entries;
@@ -66,7 +66,7 @@ server_acl_user_find(uid_t uid)
 {
 	struct server_acl_user	find = { .uid = uid };
 
-	return RB_FIND(server_acl_entries, &server_acl_entries, &find);
+	return (RB_FIND(server_acl_entries, &server_acl_entries, &find));
 }
 
 /* Display the tree. */
diff --git a/server-client.c b/server-client.c
index 22c8fa80..8144bcd5 100644
--- a/server-client.c
+++ b/server-client.c
@@ -3158,7 +3158,7 @@ server_client_add_client_window(struct client *c, u_int id)
 		cw->window = id;
 		RB_INSERT(client_windows, &c->windows, cw);
 	}
-	return cw;
+	return (cw);
 }
 
 /* Get client active pane. */
diff --git a/tmux.c b/tmux.c
index 11c368ff..b9f2be30 100644
--- a/tmux.c
+++ b/tmux.c
@@ -325,7 +325,7 @@ find_home(void)
 const char *
 getversion(void)
 {
-	return TMUX_VERSION;
+	return (TMUX_VERSION);
 }
 
 int
diff --git a/window-buffer.c b/window-buffer.c
index 07851e75..2f52ee3f 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -308,7 +308,7 @@ window_buffer_get_key(void *modedata, void *itemdata, u_int line)
 	}
 	pb = paste_get_name(item->name);
 	if (pb == NULL)
-		return KEYC_NONE;
+		return (KEYC_NONE);
 
 	ft = format_create(NULL, NULL, FORMAT_NONE, 0);
 	format_defaults(ft, NULL, NULL, 0, NULL);
@@ -320,7 +320,7 @@ window_buffer_get_key(void *modedata, void *itemdata, u_int line)
 	key = key_string_lookup_string(expanded);
 	free(expanded);
 	format_free(ft);
-	return key;
+	return (key);
 }
 
 static struct screen *
diff --git a/window-client.c b/window-client.c
index 00f36c7c..8d501b0d 100644
--- a/window-client.c
+++ b/window-client.c
@@ -281,7 +281,7 @@ window_client_get_key(void *modedata, void *itemdata, u_int line)
 	key = key_string_lookup_string(expanded);
 	free(expanded);
 	format_free(ft);
-	return key;
+	return (key);
 }
 
 static struct screen *
diff --git a/window-tree.c b/window-tree.c
index 77011ea2..d90bf817 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -895,7 +895,7 @@ window_tree_get_key(void *modedata, void *itemdata, u_int line)
 	key = key_string_lookup_string(expanded);
 	free(expanded);
 	format_free(ft);
-	return key;
+	return (key);
 }
 
 static struct screen *
diff --git a/window.c b/window.c
index bce8913a..c0cd9bdc 100644
--- a/window.c
+++ b/window.c
@@ -1056,7 +1056,7 @@ window_pane_resize(struct window_pane *wp, u_int sx, u_int sy)
 	if (sx == wp->sx && sy == wp->sy)
 		return;
 
-	r = xmalloc (sizeof *r);
+	r = xmalloc(sizeof *r);
 	r->sx = sx;
 	r->sy = sy;
 	r->osx = wp->sx;