diff --git a/telnet/commands.c b/telnet/commands.c
index dba2b8e..bdec69b 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -81,7 +81,7 @@ static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 
 #ifndef       MAXHOSTNAMELEN
 #define       MAXHOSTNAMELEN 256
-#endif        MAXHOSTNAMELEN
+#endif
 
 typedef int (*intrtn_t)(int, char **);
 
diff --git a/telnet/network.c b/telnet/network.c
index 049f54f..889b1b8 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -44,6 +44,7 @@ static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #include <sys/time.h>
 
 #include <errno.h>
+#include <stdlib.h>
 
 #include <arpa/telnet.h>
 #include <unistd.h>
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index fca026d..8f1f328 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -654,9 +654,9 @@ TerminalNewMode(int f)
 	(void) signal(SIGTSTP, SIG_DFL);
 # ifndef SOLARIS
 	(void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
-# else	SOLARIS
+# else	/* SOLARIS */
 	(void) sigrelse(SIGTSTP);
-# endif	SOLARIS
+# endif	/* SOLARIS */
 #endif	/* SIGTSTP */
 #ifndef USE_TERMIO
 	ltc = oltc;
diff --git a/telnet/terminal.c b/telnet/terminal.c
index 9c77277..0244cac 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -42,6 +42,8 @@ static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #include <arpa/telnet.h>
 #include <sys/types.h>
 
+#include <stdlib.h>
+
 #include "ring.h"
 
 #include "externs.h"
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 8342c31..b78d281 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "general.h"