diff --git a/cmd-list-clients.c b/cmd-list-clients.c
index ba479689..92d25a9d 100644
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -28,7 +28,7 @@
  * List all clients.
  */
 
-int	cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval	cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_clients_entry = {
 	"list-clients", "lsc",
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index d93f368b..ff6421ad 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -97,7 +97,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
 	return (CMD_RETURN_NORMAL);
 }
 
-int
+enum cmd_retval
 cmd_list_keys_table(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
diff --git a/cmd-new-window.c b/cmd-new-window.c
index 1d9a1e66..2f111935 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -26,7 +26,7 @@
  * Create a new window.
  */
 
-int	cmd_new_window_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval	cmd_new_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_new_window_entry = {
 	"new-window", "neww",
diff --git a/cmd-swap-window.c b/cmd-swap-window.c
index afd55e0b..b2e2c119 100644
--- a/cmd-swap-window.c
+++ b/cmd-swap-window.c
@@ -26,7 +26,7 @@
  * Swap one window with another.
  */
 
-int	cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval	cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_swap_window_entry = {
 	"swap-window", "swapw",