diff --git a/lib/cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c
index 0365e73c115..2518b93c197 100644
--- a/lib/cmdline/cmdline_os_unix.c
+++ b/lib/cmdline/cmdline_os_unix.c
@@ -17,7 +17,7 @@ terminal_adjust(struct cmdline *cl)
 
 	memcpy(&term, &cl->oldterm, sizeof(term));
 	term.c_lflag &= ~(ICANON | ECHO | ISIG);
-	tcsetattr(0, TCSANOW, &term);
+	tcsetattr(STDIN_FILENO, TCSANOW, &term);
 
 	setbuf(stdin, NULL);
 }
@@ -25,7 +25,7 @@ terminal_adjust(struct cmdline *cl)
 void
 terminal_restore(const struct cmdline *cl)
 {
-	tcsetattr(fileno(stdin), TCSANOW, &cl->oldterm);
+	tcsetattr(STDIN_FILENO, TCSANOW, &cl->oldterm);
 }
 
 ssize_t
diff --git a/lib/cmdline/cmdline_socket.c b/lib/cmdline/cmdline_socket.c
index 78fb67c4745..70ae7a1a68b 100644
--- a/lib/cmdline/cmdline_socket.c
+++ b/lib/cmdline/cmdline_socket.c
@@ -4,7 +4,6 @@
  * All rights reserved.
  */
 
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -34,7 +33,7 @@ cmdline_stdin_new(cmdline_parse_ctx_t *ctx, const char *prompt)
 {
 	struct cmdline *cl;
 
-	cl = cmdline_new(ctx, prompt, 0, 1);
+	cl = cmdline_new(ctx, prompt, STDIN_FILENO, STDOUT_FILENO);
 
 	if (cl != NULL)
 		terminal_adjust(cl);