diff --git a/cmd-find.c b/cmd-find.c
index 4c08147d..813bfbc9 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -49,9 +49,6 @@ int	cmd_find_get_pane(struct cmd_find_state *, const char *);
 int	cmd_find_get_pane_with_session(struct cmd_find_state *, const char *);
 int	cmd_find_get_pane_with_window(struct cmd_find_state *, const char *);
 
-void	cmd_find_clear_state(struct cmd_find_state *, struct cmd_q *, int);
-void	cmd_find_log_state(const char *, struct cmd_find_state *);
-
 const char *cmd_find_session_table[][2] = {
 	{ NULL, NULL }
 };
diff --git a/cmd.c b/cmd.c
index 2ef91437..4b31b4b3 100644
--- a/cmd.c
+++ b/cmd.c
@@ -387,22 +387,6 @@ usage:
 	return (NULL);
 }
 
-static void
-cmd_clear_state(struct cmd_state *state)
-{
-	state->c = NULL;
-
-	state->tflag.s = NULL;
-	state->tflag.wl = NULL;
-	state->tflag.wp = NULL;
-	state->tflag.idx = -1;
-
-	state->sflag.s = NULL;
-	state->sflag.wl = NULL;
-	state->sflag.wp = NULL;
-	state->sflag.idx = -1;
-}
-
 static int
 cmd_prepare_state_flag(struct cmd_find_state *fs, enum cmd_entry_flag flag,
     const char *target, struct cmd_q *cmdq)
@@ -492,7 +476,9 @@ cmd_prepare_state(struct cmd *cmd, struct cmd_q *cmdq)
 	log_debug("preparing state for %s (client %p)", tmp, cmdq->client);
 	free(tmp);
 
-	cmd_clear_state(state);
+	state->c = NULL;
+	cmd_find_clear_state(&state->tflag, NULL, 0);
+	cmd_find_clear_state(&state->sflag, NULL, 0);
 
 	flag = cmd->entry->cflag;
 	if (flag == CMD_NONE) {
diff --git a/tmux.h b/tmux.h
index 24920dcf..9694c4dc 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1766,6 +1766,9 @@ long long	 args_strtonum(struct args *, u_char, long long, long long,
 int		 cmd_find_target(struct cmd_find_state *, struct cmd_q *,
 		     const char *, enum cmd_find_type, int);
 struct client	*cmd_find_client(struct cmd_q *, const char *, int);
+void		 cmd_find_clear_state(struct cmd_find_state *, struct cmd_q *,
+		     int);
+void		 cmd_find_log_state(const char *, struct cmd_find_state *);
 
 /* cmd.c */
 int		 cmd_pack_argv(int, char **, char *, size_t);