More cleanup and sorting on header section

OK tb@ and he also pointed out that for consistency with rest of the tree we
should include termios.h instead of sys/ttydefaults.h, where applicable

5 files changed, 17 insertions, 14 deletions

diff --git a/games/gomoku/bdinit.c b/games/gomoku/bdinit.c
index 7b9af0c08b8..76ceb584b8e 100644
--- a/games/gomoku/bdinit.c
+++ b/games/gomoku/bdinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bdinit.c,v 1.6 2009/10/27 23:59:24 deraadt Exp $	*/
+/*	$OpenBSD: bdinit.c,v 1.7 2016/01/04 17:33:24 mestre Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#include "gomoku.h"
 #include <string.h>
 
+#include "gomoku.h"
+
 void
 bdinit(bp)
 	struct spotstr *bp;
diff --git a/games/gomoku/bdisp.c b/games/gomoku/bdisp.c
index 0fe37506ed1..e649f658162 100644
--- a/games/gomoku/bdisp.c
+++ b/games/gomoku/bdisp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bdisp.c,v 1.11 2012/03/04 04:05:15 fgsch Exp $	*/
+/*	$OpenBSD: bdisp.c,v 1.12 2016/01/04 17:33:24 mestre Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#include "gomoku.h"
 #include <curses.h>
-#include <string.h>
 #include <err.h>
+#include <string.h>
+
+#include "gomoku.h"
 
 #define	SCRNH		24		/* assume 24 lines for the moment */
 #define	SCRNW		80		/* assume 80 chars for the moment */
diff --git a/games/gomoku/gomoku.h b/games/gomoku/gomoku.h
index 08aa7f27d82..825c69ec050 100644
--- a/games/gomoku/gomoku.h
+++ b/games/gomoku/gomoku.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gomoku.h,v 1.11 2015/12/26 00:26:39 mestre Exp $	*/
+/*	$OpenBSD: gomoku.h,v 1.12 2016/01/04 17:33:24 mestre Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,6 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
 
 /* board dimensions */
 #define BSZ	19
diff --git a/games/gomoku/pickmove.c b/games/gomoku/pickmove.c
index 098cce378e6..ab8ac3364b5 100644
--- a/games/gomoku/pickmove.c
+++ b/games/gomoku/pickmove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pickmove.c,v 1.14 2015/08/22 14:47:41 deraadt Exp $	*/
+/*	$OpenBSD: pickmove.c,v 1.15 2016/01/04 17:33:24 mestre Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  */
 
-#include "gomoku.h"
-#include <stdlib.h>
-#include <string.h>
 #include <curses.h>
 #include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "gomoku.h"
 
 #define BITS_PER_INT	(sizeof(int) * CHAR_BIT)
 #define MAPSZ		(BAREA / BITS_PER_INT)
diff --git a/games/gomoku/stoc.c b/games/gomoku/stoc.c
index ca25100e580..31a040d1b10 100644
--- a/games/gomoku/stoc.c
+++ b/games/gomoku/stoc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stoc.c,v 1.9 2015/10/24 17:36:06 mmcc Exp $	*/
+/*	$OpenBSD: stoc.c,v 1.10 2016/01/04 17:33:24 mestre Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#include "gomoku.h"
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+
+#include "gomoku.h"
 
 char	*letters	= "<ABCDEFGHJKLMNOPQRST>";