--- Dbg.c
+++ Dbg.c
@@ -9,6 +9,7 @@
 */
 
 #include <stdio.h>
+#include <unistd.h>
 
 #include "tcldbgcf.h"
 #if 0
--- exp_chan.c
+++ exp_chan.c
@@ -568,6 +568,8 @@
 	    return esPtr;
 	}
     }
+    /*NOTREACHED*/
+    abort();
 }
 
 void
--- exp_clib.c
+++ exp_clib.c
@@ -8,6 +8,7 @@
 */
 
 #include "expect_cf.h"
+#include <unistd.h>
 #include <stdio.h>
 #include <setjmp.h>
 #ifdef HAVE_INTTYPES_H
--- exp_command.c
+++ exp_command.c
@@ -2317,6 +2317,7 @@
 
 	Tcl_Exit(value);
 	/*NOTREACHED*/
+	abort();
 }
 
 /*ARGSUSED*/
--- exp_glob.c
+++ exp_glob.c
@@ -11,6 +11,7 @@
 
 */
 
+#include <string.h>
 #include "expect_cf.h"
 #include "tcl.h"
 #include "exp_int.h"
--- exp_main_exp.c
+++ exp_main_exp.c
@@ -12,6 +12,7 @@
 
 #include "expect_cf.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include "tcl.h"
 #include "expect_tcl.h"
 
--- exp_main_sub.c
+++ exp_main_sub.c
@@ -468,6 +468,7 @@
 	  Tcl_Eval(interp, buffer); 
 	}
 	/*NOTREACHED*/
+	abort();
 }
 
 static char init_auto_path[] = "\
--- 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
@@ -140,7 +140,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
@@ -151,7 +151,7 @@
 #endif
 }
 
-int exp_win2_size_get(fd)
+void exp_win2_size_get(fd)
 int fd;
 {
 #ifdef TIOCGWINSZ
--- exp_win.h
+++ exp_win.h
@@ -6,8 +6,8 @@
 would appreciate credit if you use this file or parts of it.
 */
 
-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();
 void exp_win_rows_get();
--- expect.c
+++ expect.c
@@ -2015,6 +2015,8 @@
 	case EXP_CONTINUE_TIMER:	return EXP_TCLCNTTIMER;
 	case EXP_TCL_RETURN:		return EXP_TCLRETTCL;
 	}
+	/*NOTREACHED*/
+	abort();
 }
 
 /* map from EXP_ style return value to TCL_ style return values */
@@ -2031,6 +2033,8 @@
 	case EXP_TCLCNTTIMER:		return EXP_CONTINUE_TIMER;
 	case EXP_TCLRETTCL:		return EXP_TCL_RETURN;
 	}
+	/*NOTREACHED*/
+	abort();
 }
 
 /* variables predefined by expect are retrieved using this routine
@@ -2110,6 +2114,8 @@
 #ifdef LINT
 	return("unknown expect command");
 #endif
+	/*NOTREACHED*/
+	abort();
 }
 
 /* exp_indirect_update2 is called back via Tcl's trace handler whenever */
--- pkgIndex.in
+++ pkgIndex.in
@@ -7,4 +7,4 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
+package ifneeded Expect @EXP_VERSION_FULL@ [list load "@EXP_SHARED_LIB_FILE@"]
--- pty_termios.c
+++ pty_termios.c
@@ -11,6 +11,8 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
+#include <pty.h>
 
 #if defined(SIGCLD) && !defined(SIGCHLD)
 #define SIGCHLD SIGCLD