--- exp_clib.c
+++ exp_clib.c
@@ -9,6 +9,7 @@
 
 #include "expect_cf.h"
 #include <stdio.h>
+#include <unistd.h>
 #include <setjmp.h>
 #ifdef HAVE_INTTYPES_H
 #  include <inttypes.h>
--- exp_main_sub.c
+++ exp_main_sub.c
@@ -482,6 +482,7 @@
 	  Tcl_Eval(interp, buffer); 
 	}
 	/*NOTREACHED*/
+	return(TCL_ERROR);
 }
 
 static char init_auto_path[] = "\
--- exp_trap.c
+++ exp_trap.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <sys/types.h>
+#include <string.h>
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
--- exp_win.c
+++ exp_win.c
@@ -78,7 +78,7 @@
 static exp_winsize winsize = {0, 0};
 static exp_winsize win2size = {0, 0};
 
-int exp_window_size_set(fd)
+void exp_window_size_set(fd)
 int fd;
 {
 #ifdef TIOCSWINSZ
@@ -89,7 +89,7 @@
 #endif
 }
 
-int exp_window_size_get(fd)
+void exp_window_size_get(fd)
 int fd;
 {
 #ifdef TIOCGWINSZ
@@ -142,7 +142,7 @@
  * separate copy of everything above - used for handling user stty requests
  */
 
-int exp_win2_size_set(fd)
+void exp_win2_size_set(fd)
 int fd;
 {
 #ifdef TIOCSWINSZ
@@ -153,7 +153,7 @@
 #endif
 }
 
-int exp_win2_size_get(fd)
+void exp_win2_size_get(fd)
 int fd;
 {
 #ifdef TIOCGWINSZ
--- exp_win.h
+++ exp_win.h
@@ -8,8 +8,8 @@
 
 #include <tcl.h> /* For _ANSI_ARGS_ */
 
-int exp_window_size_set();
-int exp_window_size_get();
+void exp_window_size_set();
+void exp_window_size_get();
 
 void  exp_win_rows_set    _ANSI_ARGS_ ((char* rows));
 char* exp_win_rows_get    _ANSI_ARGS_ ((void));
--- pty_termios.c
+++ pty_termios.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
 
 #if defined(SIGCLD) && !defined(SIGCHLD)
 #define SIGCHLD SIGCLD