diff --git a/arguments.c b/arguments.c
index 5ac51ddc..37028648 100644
--- a/arguments.c
+++ b/arguments.c
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/cmd-find.c b/cmd-find.c
index 630a6340..f2b098ab 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -891,7 +891,7 @@ cmd_find_from_client(struct cmd_find_state *fs, struct client *c)
 		}
 		if (wl != NULL) {
 			fs->s = s;
-			fs->wl = s->curw; /* use active session */
+			fs->wl = s->curw; /* use current session */
 			fs->w = fs->wl->window;
 			fs->wp = fs->w->active; /* use active pane */
 
diff --git a/tmux.c b/tmux.c
index 2fb57092..9c32fa0a 100644
--- a/tmux.c
+++ b/tmux.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <langinfo.h>
 #include <locale.h>
 #include <paths.h>