diff --git a/client.c b/client.c
index e7fa4b71..d1a3b177 100644
--- a/client.c
+++ b/client.c
@@ -349,10 +349,6 @@ client_send_identify(int flags)
 		fd = open("/", O_RDONLY);
 	client_write_one(MSG_IDENTIFY_CWD, fd, NULL, 0);
 
-#ifdef __CYGWIN__
-	snprintf(&data.ttyname, sizeof data.ttyname, "%s",
-	    ttyname(STDIN_FILENO));
-#else
 	if ((fd = dup(STDIN_FILENO)) == -1)
 		fatal("dup failed");
 	client_write_one(MSG_IDENTIFY_STDIN, fd, NULL, 0);
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index fc56dd8f..3788fc22 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vis.h>
 
 #include "tmux.h"
 
diff --git a/format.c b/format.c
index d8d34fe7..450e15f3 100644
--- a/format.c
+++ b/format.c
@@ -355,7 +355,7 @@ format_get_command(struct window_pane *wp)
 {
 	char	*cmd, *out;
 
-	cmd = get_proc_name(wp->fd, wp->tty);
+	cmd = osdep_get_name(wp->fd, wp->tty);
 	if (cmd == NULL || *cmd == '\0') {
 		free(cmd);
 		cmd = xstrdup(wp->cmd);