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, 12 insertions, 22 deletions

diff --git a/games/tetris/input.c b/games/tetris/input.c
index cd3e34d7f3f..b65f7d22c9c 100644
--- a/games/tetris/input.c
+++ b/games/tetris/input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: input.c,v 1.15 2014/12/31 15:42:08 tedu Exp $	*/
+/*	$OpenBSD: input.c,v 1.16 2016/01/04 17:33:24 mestre Exp $	*/
 /*    $NetBSD: input.c,v 1.3 1996/02/06 22:47:33 jtc Exp $    */
 
 /*-
@@ -39,13 +39,9 @@
  * Tetris input.
  */
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <errno.h>
-#include <unistd.h>
 #include <poll.h>
-#include <string.h>
+#include <unistd.h>
 
 #include "input.h"
 #include "tetris.h"
diff --git a/games/tetris/scores.c b/games/tetris/scores.c
index aafc94a7017..285c7c7b2d3 100644
--- a/games/tetris/scores.c
+++ b/games/tetris/scores.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scores.c,v 1.18 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: scores.c,v 1.19 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: scores.c,v 1.2 1995/04/22 07:42:38 cgd Exp $	*/
 
 /*-
@@ -42,9 +42,6 @@
  *
  * Major whacks since then.
  */
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/games/tetris/screen.c b/games/tetris/screen.c
index 4ea8aeff890..077825cf3ed 100644
--- a/games/tetris/screen.c
+++ b/games/tetris/screen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: screen.c,v 1.15 2014/12/07 21:06:57 deraadt Exp $	*/
+/*	$OpenBSD: screen.c,v 1.16 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: screen.c,v 1.4 1995/04/29 01:11:36 mycroft Exp $	*/
 
 /*-
@@ -48,7 +48,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <term.h>
-#include <termios.h>
 #include <unistd.h>
 
 #include "screen.h"
diff --git a/games/tetris/shapes.c b/games/tetris/shapes.c
index 447e8b3dc05..da2924f3c0a 100644
--- a/games/tetris/shapes.c
+++ b/games/tetris/shapes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shapes.c,v 1.9 2010/07/20 00:15:20 deraadt Exp $	*/
+/*	$OpenBSD: shapes.c,v 1.10 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: shapes.c,v 1.2 1995/04/22 07:42:44 cgd Exp $	*/
 
 /*-
@@ -42,6 +42,7 @@
  */
 
 #include <unistd.h>
+
 #include "tetris.h"
 
 #define	TL	-B_COLS-1	/* top left */
diff --git a/games/tetris/tetris.c b/games/tetris/tetris.c
index 629694729fa..f2c7d84cf28 100644
--- a/games/tetris/tetris.c
+++ b/games/tetris/tetris.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tetris.c,v 1.27 2015/12/25 20:59:09 mestre Exp $	*/
+/*	$OpenBSD: tetris.c,v 1.28 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd Exp $	*/
 
 /*-
@@ -39,9 +39,6 @@
  * Tetris (or however it is spelled).
  */
 
-#include <sys/time.h>
-#include <sys/types.h>
-
 #include <err.h>
 #include <limits.h>
 #include <signal.h>
@@ -64,11 +61,11 @@ int	score;
 char	key_msg[100];
 int	showpreview, classic;
 
-static void	elide(void);
-static void	setup_board(void);
-const struct shape *randshape(void);
-void	onintr(int);
-__dead void	usage(void);
+static void		 elide(void);
+void			 onintr(int);
+const struct shape	*randshape(void);
+static void		 setup_board(void);
+__dead void		 usage(void);
 
 /*
  * Set up the initial board.  The bottom display row is completely set,