Headers cleanup with and OK tb@

This was prompted by an initial patch sent by Edgar Pettijohn
<edgar ! pettijohn-web.com> but the actual commit is different

10 files changed, 26 insertions, 24 deletions

diff --git a/games/adventure/done.c b/games/adventure/done.c
index 16968025d93..a392a4ccaa0 100644
--- a/games/adventure/done.c
+++ b/games/adventure/done.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: done.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $	*/
+/*	$OpenBSD: done.c,v 1.9 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: done.c,v 1.2 1995/03/21 12:05:01 cgd Exp $	*/
 
 /*-
@@ -39,8 +39,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "hdr.h"
+
 #include "extern.h"
+#include "hdr.h"
 
 int
 score(void)			/* sort of like 20000 */
diff --git a/games/adventure/extern.h b/games/adventure/extern.h
index d92261d9b18..383c2094b12 100644
--- a/games/adventure/extern.h
+++ b/games/adventure/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.9 2016/01/01 15:56:04 tedu Exp $	*/
+/*	$OpenBSD: extern.h,v 1.10 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: extern.h,v 1.3 1997/10/11 01:55:27 lukem Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <sys/types.h>
+
 #include <string.h>
 
 /* crc.c */
diff --git a/games/adventure/hdr.h b/games/adventure/hdr.h
index 4c286b45df2..5c96b7c9eaa 100644
--- a/games/adventure/hdr.h
+++ b/games/adventure/hdr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hdr.h,v 1.14 2014/12/08 21:56:27 deraadt Exp $	*/
+/*	$OpenBSD: hdr.h,v 1.15 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: hdr.h,v 1.2 1995/03/21 12:05:02 cgd Exp $	*/
 
 /*-
@@ -53,6 +53,7 @@
 /* hdr.h: included by c advent files */
 
 #include <sys/types.h>
+
 #include <signal.h>
 
 int     datfd;			/* message file descriptor	*/
diff --git a/games/adventure/init.c b/games/adventure/init.c
index 953c7b3abb0..fd0055e93bf 100644
--- a/games/adventure/init.c
+++ b/games/adventure/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.14 2016/01/03 14:38:16 mestre Exp $	*/
+/*	$OpenBSD: init.c,v 1.15 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: init.c,v 1.4 1996/05/21 21:53:05 mrg Exp $	*/
 
 /*-
@@ -37,11 +37,7 @@
 
 /*	Re-coding of advent in C: data initialization	*/
 
-#include <sys/types.h>
-#include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "extern.h"
 #include "hdr.h"
diff --git a/games/adventure/io.c b/games/adventure/io.c
index deff7e487e7..c60ea6d5bcb 100644
--- a/games/adventure/io.c
+++ b/games/adventure/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.20 2015/08/22 14:47:40 deraadt Exp $	*/
+/*	$OpenBSD: io.c,v 1.21 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: io.c,v 1.3 1995/04/24 12:21:37 cgd Exp $	*/
 
 /*-
@@ -39,10 +39,10 @@
 
 #include <err.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include "hdr.h"
+
 #include "extern.h"
+#include "hdr.h"
 
 /* Get command from user. No prompt, usually.	*/
 void
diff --git a/games/adventure/main.c b/games/adventure/main.c
index d589dd964c9..9cb0c396af3 100644
--- a/games/adventure/main.c
+++ b/games/adventure/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.22 2016/01/07 16:00:31 tb Exp $	*/
+/*	$OpenBSD: main.c,v 1.23 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1996/05/21 21:53:09 mrg Exp $	*/
 
 /*-
@@ -38,12 +38,12 @@
 /*	Re-coding of advent in C: main program				*/
 
 #include <err.h>
-#include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <time.h>
 #include <unistd.h>
-#include "hdr.h"
+
 #include "extern.h"
+#include "hdr.h"
 
 int
 main(int argc, char *argv[])
diff --git a/games/adventure/save.c b/games/adventure/save.c
index 2b0fe806234..f430b89e5ba 100644
--- a/games/adventure/save.c
+++ b/games/adventure/save.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: save.c,v 1.10 2014/12/08 21:56:27 deraadt Exp $	*/
+/*	$OpenBSD: save.c,v 1.11 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: save.c,v 1.2 1995/03/21 12:05:08 cgd Exp $	*/
 
 /*-
@@ -37,8 +37,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "hdr.h"
+
 #include "extern.h"
+#include "hdr.h"
 
 struct savestruct
 {
diff --git a/games/adventure/subr.c b/games/adventure/subr.c
index 6ca78d5a671..38a5bec8d60 100644
--- a/games/adventure/subr.c
+++ b/games/adventure/subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr.c,v 1.10 2009/10/27 23:59:23 deraadt Exp $	*/
+/*	$OpenBSD: subr.c,v 1.11 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: subr.c,v 1.2 1995/03/21 12:05:11 cgd Exp $	*/
 
 /*-
@@ -39,8 +39,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "hdr.h"
+
 #include "extern.h"
+#include "hdr.h"
 
 /*		Statement functions	*/
 int
diff --git a/games/adventure/vocab.c b/games/adventure/vocab.c
index 683f9a08747..113c171089d 100644
--- a/games/adventure/vocab.c
+++ b/games/adventure/vocab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vocab.c,v 1.14 2014/07/13 19:40:57 tedu Exp $	*/
+/*	$OpenBSD: vocab.c,v 1.15 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: vocab.c,v 1.2 1995/03/21 12:05:13 cgd Exp $	*/
 
 /*-
@@ -40,8 +40,9 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "hdr.h"
+
 #include "extern.h"
+#include "hdr.h"
 
 void
 dstroy(int object)
diff --git a/games/adventure/wizard.c b/games/adventure/wizard.c
index 9c785de596f..2bcdb7015f3 100644
--- a/games/adventure/wizard.c
+++ b/games/adventure/wizard.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wizard.c,v 1.18 2016/01/03 14:38:16 mestre Exp $	*/
+/*	$OpenBSD: wizard.c,v 1.19 2016/03/08 10:48:39 mestre Exp $	*/
 /*	$NetBSD: wizard.c,v 1.3 1995/04/24 12:21:41 cgd Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <time.h>
 
 #include "extern.h"
 #include "hdr.h"