Index: vi.c
--- vi.c.orig
+++ vi.c
@@ -13,10 +13,13 @@
 #endif
 #endif
 
+#include <sys/wait.h>
 #include <signal.h>
 #include <curses.h>
 #include <ctype.h>
+#include <unistd.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include "sc.h"
 
 #if defined(REGCOMP)
@@ -40,10 +43,6 @@ void gotobottom();
 
 #define istext(a) (isalnum(a) || ((a) == '_'))
 
-#define bool	int
-#define true	1
-#define false	0
-
 static void append_line();
 static void back_hist();
 static int  back_line(int arg);
@@ -667,7 +666,7 @@ dotab()
     static struct range *nextmatch;
     int len;
 
-    if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' ||
+    if ((linelim > 0 && isalnum(line[linelim-1])) || line[linelim-1] == '_' ||
 	    (completethis && line[linelim-1] == ' ')) {
 	if (!completethis) {
 	    for (completethis = line + linelim - 1; isalnum(*completethis) ||
@@ -1573,7 +1572,7 @@ search_again(bool reverse)
 #endif
 
 #ifdef REGCOMP
-    if ((last_search == NULL))
+    if (last_search == NULL)
 	return;
 #else
 #ifndef RE_COMP