diff --git a/Makefile b/Makefile
index 6ebd7a4..973e7d2 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ execute.o: execute.c execute.h estruct.h bind.h random.h display.h file.h \
  buffer.h crypt.h line.h retcode.h utf8.h mlout.h window.h defines.h
 file.o: file.c file.h buffer.h crypt.h line.h retcode.h utf8.h defines.h \
  estruct.h execute.h fileio.h input.h bind.h lock.h mlout.h window.h
-fileio.o: fileio.c fileio.h crypt.h retcode.h defines.h
+fileio.o: fileio.c fileio.h crypt.h retcode.h defines.h utf8.h
 flook.o: flook.c flook.h retcode.h defines.h fileio.h crypt.h
 input.o: input.c input.h bind.h estruct.h bindable.h display.h exec.h \
  retcode.h names.h terminal.h defines.h utf8.h wrapper.h
diff --git a/estruct.h b/estruct.h
index cb2e2d4..19461ce 100644
--- a/estruct.h
+++ b/estruct.h
@@ -297,7 +297,7 @@ void release( void *ptr) ;
 #if	CLEAN
 #define	exit(a)	cexit(a)
 
-int cexit( int status) ;
+void cexit( int status) ;
 #endif
 
 #endif
diff --git a/eval.c b/eval.c
index 2a5bd33..32bc7d3 100644
--- a/eval.c
+++ b/eval.c
@@ -9,6 +9,7 @@
  *	modified by Petri Kutvonen
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -587,7 +588,8 @@ static char *gtfun( char *fname) {
 		retstr = xlat( arg1, arg2, argx) ;
 		break ;
 	default:
-		exit(-11);		/* never should get here */
+		assert( FALSE) ;	/* never should get here */
+		retstr = errorm ;
 	}
 
 	if( arg2)
@@ -748,7 +750,9 @@ static char *gtenv( char *vname) {
 		return ltos(0);
 #endif
 	}
-	exit(-12);		/* again, we should never get here */
+
+	assert( FALSE) ;	/* again, we should never get here */
+	return errorm ;
 }
 
 /*
diff --git a/main.c b/main.c
index cdeb910..16af77b 100644
--- a/main.c
+++ b/main.c
@@ -592,8 +592,7 @@ static void dspram( void)
  *
  * int status;		return status of emacs
  */
-int cexit(int status)
-{
+void cexit( int status) {
 	struct buffer *bp;	/* buffer list pointer */
 	struct window *wp;	/* window list pointer */
 	struct window *tp;	/* temporary window pointer */