Remove simultaneous include of <sys/param.h> and <sys/types.h>.

Reorder includes to be alphabetical some places since I already was in
here.

20 files changed, 28 insertions, 56 deletions

diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 91f1eca..3504806 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -42,14 +42,13 @@ static const char copyright[] =
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
 static const char rcsid[] =
-	"$Id: csh.c,v 1.10 1997/08/08 00:49:25 steve Exp $";
+	"$Id: csh.c,v 1.11 1997/10/07 16:27:48 eivind Exp $";
 #endif
 #endif /* not lint */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <pwd.h>
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index 1815eae..cee1cbc 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -36,11 +36,10 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exec.c,v 1.6 1997/02/22 14:01:50 peter Exp $";
+	"$Id: exec.c,v 1.7 1997/08/07 21:42:07 steve Exp $";
 #endif
 #endif /* not lint */
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <dirent.h>
 #include <fcntl.h>
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 8066cd7..1e77b38 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,10 +25,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id$
+ *	$Id: ed.h,v 1.10 1997/02/22 14:03:14 peter Exp $
  */
 
-#include <sys/types.h>
 #include <sys/param.h>		/* for MAXPATHLEN */
 #include <errno.h>
 #if defined(sun) || defined(__NetBSD__)
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 8cb5a3b..d1f955f 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar_io.c,v 1.7 1997/02/22 14:04:17 peter Exp $
+ *	$Id: ar_io.c,v 1.8 1997/08/29 16:12:19 sos Exp $
  */
 
 #ifndef lint
@@ -42,11 +42,9 @@ static char const sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
-#include <sys/param.h>
 #include <signal.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 6e4ecf5..a3be1c9 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar_subs.c,v 1.7 1997/02/22 14:04:19 peter Exp $
+ *	$Id: ar_subs.c,v 1.8 1997/08/29 16:12:19 sos Exp $
  */
 
 #ifndef lint
@@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 6a579c5..335bc1f 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf_subs.c,v 1.7 1997/02/22 14:04:20 peter Exp $
+ *	$Id: buf_subs.c,v 1.8 1997/08/29 16:12:20 sos Exp $
  */
 
 #ifndef lint
@@ -42,10 +42,7 @@ static char const sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
-#include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 56f59f1..b2a23e1 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cache.c,v 1.7 1997/06/02 06:30:06 charnier Exp $
+ *	$Id: cache.c,v 1.8 1997/08/29 16:12:21 sos Exp $
  */
 
 #ifndef lint
@@ -42,9 +42,7 @@ static char const sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <string.h>
 #include <stdio.h>
 #include <pwd.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 23bbc78..c1e43cf 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpio.c,v 1.7 1997/02/22 14:04:23 peter Exp $
+ *	$Id: cpio.c,v 1.8 1997/08/29 16:12:21 sos Exp $
  */
 
 #ifndef lint
@@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index f4bcee2..baabde9 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file_subs.c,v 1.7 1997/02/22 14:04:26 peter Exp $
+ *	$Id: file_subs.c,v 1.8 1997/08/29 16:12:23 sos Exp $
  */
 
 #ifndef lint
@@ -45,7 +45,6 @@ static char const sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 00dce37..e2db74d 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ftree.c,v 1.7 1997/02/22 14:04:27 peter Exp $
+ *	$Id: ftree.c,v 1.8 1997/08/29 16:12:24 sos Exp $
  */
 
 #ifndef lint
@@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index bf6a404..4777a19 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: gen_subs.c,v 1.9 1997/02/22 14:04:31 peter Exp $
  */
 
 #ifndef lint
@@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <stdio.h>
 #include <utmp.h>
 #include <unistd.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index ef0b1c7..66fc3e3 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: options.c,v 1.8 1997/03/28 15:24:27 imp Exp $
+ *	$Id: options.c,v 1.9 1997/08/29 16:12:27 sos Exp $
  */
 
 #ifndef lint
@@ -42,10 +42,8 @@ static char const sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/mtio.h>
-#include <sys/param.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 2933e1f..800162b 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pat_rep.c,v 1.9 1997/06/02 06:30:06 charnier Exp $
+ *	$Id: pat_rep.c,v 1.10 1997/08/29 16:12:27 sos Exp $
  */
 
 #ifndef lint
@@ -42,9 +42,7 @@ static char const sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 7199f95..6bb34be 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pax.c,v 1.8 1997/02/22 14:04:39 peter Exp $
+ *	$Id: pax.c,v 1.9 1997/08/29 16:12:28 sos Exp $
  */
 
 #ifndef lint
@@ -47,17 +47,16 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
-#include <stdio.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include "pax.h"
 #include "extern.h"
 static int gen_init __P((void));
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index b740aed..47aca3d 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sel_subs.c,v 1.6 1997/02/22 14:04:41 peter Exp $
+ *	$Id: sel_subs.c,v 1.7 1997/08/29 16:12:29 sos Exp $
  */
 
 #ifndef lint
@@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <pwd.h>
 #include <grp.h>
 #include <stdio.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 619b5e9..87da13b 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tables.c,v 1.8 1997/06/02 06:30:06 charnier Exp $
+ *	$Id: tables.c,v 1.9 1997/08/29 16:12:29 sos Exp $
  */
 
 #ifndef lint
@@ -44,13 +44,12 @@ static char const sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/fcntl.h>
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
 #include "pax.h"
 #include "tables.h"
 #include "extern.h"
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index c528da9..c16cdb9 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tar.c,v 1.7 1997/02/22 14:04:45 peter Exp $
+ *	$Id: tar.c,v 1.8 1997/08/29 16:12:30 sos Exp $
  */
 
 #ifndef lint
@@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 51272ac..afeb1f2 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tty_subs.c,v 1.6 1997/02/22 14:04:47 peter Exp $
+ *	$Id: tty_subs.c,v 1.7 1997/08/29 16:12:30 sos Exp $
  */
 
 #ifndef lint
@@ -42,12 +42,9 @@ static char const sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 563892f..a17b5d0 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: jobs.c,v 1.15 1997/05/24 21:04:55 steve Exp $
+ *	$Id: jobs.c,v 1.16 1997/08/18 02:53:19 steve Exp $
  */
 
 #ifndef lint
@@ -45,7 +45,6 @@ static char const sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #ifdef BSD
 #include <sys/wait.h>
diff --git a/bin/test/test.c b/bin/test/test.c
index 59ccf33..d74b299 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: test.c,v 1.17 1997/02/22 14:06:25 peter Exp $
  */
 
 #ifndef lint
@@ -46,9 +46,8 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)test.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/stat.h>
 
 #include <ctype.h>
 #include <err.h>