More headers removal and sorted the remaining alphabetically.

Most noticeable that were removed are sys/types.h which will be included from
stdlib.h and in turn also brings along sys/cdefs.h. The other one is limits.h
that was used with the old idiom (denom * random() / LONG_MAX), although it was
only removed were applicable (some files still need that header).

OK tb@

3 files changed, 25 insertions, 22 deletions

diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 3250420be74..226016af719 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fortune.c,v 1.48 2015/12/25 20:59:09 mestre Exp $	*/
+/*	$OpenBSD: fortune.c,v 1.49 2016/01/04 11:58:35 mestre Exp $	*/
 /*	$NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $	*/
 
 /*-
@@ -35,18 +35,19 @@
 
 #include <sys/stat.h>
 
+#include <assert.h>
+#include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <assert.h>
-#include <unistd.h>
+#include <limits.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 #include <regex.h>
-#include "strfile.h"
+#include <unistd.h>
+
 #include "pathnames.h"
+#include "strfile.h"
 
 #define	bool	short
 
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index 42a94c12fa2..cf207cd7fe6 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strfile.c,v 1.25 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: strfile.c,v 1.26 2016/01/04 11:58:35 mestre Exp $	*/
 /*	$NetBSD: strfile.c,v 1.4 1995/04/24 12:23:09 cgd Exp $	*/
 
 /*-
@@ -33,15 +33,15 @@
  * SUCH DAMAGE.
  */
 
-#include	<ctype.h>
-#include	<err.h>
-#include	<limits.h>
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<unistd.h>
+#include <ctype.h>
+#include <err.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
-#include	"strfile.h"
+#include "strfile.h"
 
 /*
  *	This program takes a file composed of strings separated by
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index 43bcb645a54..edfef6cd98f 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unstr.c,v 1.11 2014/11/16 04:49:48 guenther Exp $	*/
+/*	$OpenBSD: unstr.c,v 1.12 2016/01/04 11:58:35 mestre Exp $	*/
 /*	$NetBSD: unstr.c,v 1.3 1995/03/23 08:29:00 cgd Exp $	*/
 
 /*-
@@ -46,12 +46,14 @@
  *	Ken Arnold		Aug 13, 1978
  */
 
-#include	<ctype.h>
-#include	<err.h>
-#include	<limits.h>
-#include	<stdio.h>
-#include	<string.h>
-#include	"strfile.h"
+#include <ctype.h>
+#include <err.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "strfile.h"
 
 char	*Infile,			/* name of input file */
 	Datafile[PATH_MAX],		/* name of data file */