Remove #include workarounds; no binary change.

Author: natano

usr.bin/vi/common/exf.c

@@ -15,13 +15,6 @@
 #include <sys/queue.h>
 #include <sys/stat.h>
 
-/*
- * We include <sys/file.h>, because the flock(2) and open(2) #defines
- * were found there on historical systems.  We also include <fcntl.h>
- * because the open(2) #defines are found there on newer systems.
- */
-#include <sys/file.h>
-
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>

usr.bin/vi/common/recover.c

@@ -15,13 +15,6 @@
 #include <sys/queue.h>
 #include <sys/stat.h>
 
-/*
- * We include <sys/file.h>, because the open #defines were found there
- * on historical systems.  We also include <fcntl.h> because the open(2)
- * #defines are found there on newer systems.
- */
-#include <sys/file.h>
-
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>

usr.bin/vi/ex/ex_script.c

@@ -23,10 +23,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>		/* XXX: OSF/1 bug: include before <grp.h> */
 #include <grp.h>
 #include <limits.h>
 #include <poll.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>