diff --git a/sftp.c b/sftp.c
index 43805cb14..e02a94dd8 100644
--- a/sftp.c
+++ b/sftp.c
@@ -53,6 +53,7 @@ typedef void EditLine;
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #ifdef HAVE_UTIL_H
 # include <util.h>
@@ -2601,7 +2602,7 @@ main(int argc, char **argv)
 
 #ifdef WINDOWS
 		addargs(&args, "sftp-server.exe");
-#elif
+#else
 		addargs(&args, "sftp-server");
 #endif // WINDOWS
 
diff --git a/sshd.c b/sshd.c
index 0f7c38842..4aea2a47e 100644
--- a/sshd.c
+++ b/sshd.c
@@ -494,14 +494,14 @@ privsep_preauth_child(void)
 	}
 }
 
-void
+static void
 send_rexec_state(int, struct sshbuf *);
 static void send_config_state(int fd, struct sshbuf *conf)
 {
 	send_rexec_state(fd, conf);
 }
 
-void
+static void
 recv_rexec_state(int, struct sshbuf *);
 static void recv_config_state(int fd, struct sshbuf *conf)
 {