diff --git a/search.c b/search.c
index 32877ab..6502f9b 100644
--- a/search.c
+++ b/search.c
@@ -739,6 +739,10 @@ static int replaces(int kind, int f, int n)
 	struct line *lastline;		/* position of last replace and */
 	int lastoff;		/* offset (for 'u' query option) */
 
+/* rfi */
+	lastline = NULL ;
+	lastoff = 0 ;
+
 	if (curbp->b_mode & MDVIEW)	/* don't allow this command if      */
 		return rdonly();	/* we are in read only mode     */
 
diff --git a/termio.c b/termio.c
index 9a8d760..ac6d583 100644
--- a/termio.c
+++ b/termio.c
@@ -14,6 +14,10 @@
 #include	"estruct.h"
 #include        "edef.h"
 
+/* rfi */
+#include <unistd.h>
+#include <sys/ioctl.h>
+
 #if     VMS
 #include        <stsdef.h>
 #include        <ssdef.h>
@@ -269,8 +273,7 @@ void ttclose(void)
  * On CPM terminal I/O unbuffered, so we just write the byte out. Ditto on
  * MS-DOS (use the very very raw console output routine).
  */
-void ttputc(c)
-{
+void ttputc( int c) {
 #if     VMS
 	if (nobuf >= NOBUF)
 		ttflush();
@@ -290,8 +293,7 @@ void ttputc(c)
  * Flush terminal buffer. Does real work where the terminal output is buffered
  * up. A no-operation on systems where byte at a time terminal I/O is done.
  */
-int ttflush(void)
-{
+void ttflush( void) {
 #if     VMS
 	int status;
 	int iosb[2];
@@ -339,8 +341,7 @@ int ttflush(void)
  * at all. More complex in VMS that almost anyplace else, which figures. Very
  * simple on CPM, because the system can do exactly what you want.
  */
-ttgetc()
-{
+int ttgetc( void) {
 #if     VMS
 	int status;
 	int iosb[2];
@@ -412,7 +413,7 @@ ttgetc()
 		keyboard buffer
 */
 
-typahead()
+int typahead( void)
 {
 #if	MSDOS & (MSC | TURBO)
 	if (kbhit() != 0)