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

35 files changed, 94 insertions, 118 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>";
 
diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c
index 1783f4b3c09..5da19c842f7 100644
--- a/games/grdc/grdc.c
+++ b/games/grdc/grdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grdc.c,v 1.23 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: grdc.c,v 1.24 2016/01/04 17:33:24 mestre Exp $	*/
 /*
  *
  * Copyright 2002 Amos Shapir.  Public domain.
@@ -12,15 +12,13 @@
  */
 
 #include <sys/ioctl.h>
-#include <sys/types.h>
 
 #include <curses.h>
+#include <err.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
-#include <err.h>
 
 #define XLENGTH 58
 #define YDEPTH  7
diff --git a/games/hangman/endgame.c b/games/hangman/endgame.c
index 365c67e44c2..b4e5b031979 100644
--- a/games/hangman/endgame.c
+++ b/games/hangman/endgame.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endgame.c,v 1.8 2015/12/31 15:20:36 mestre Exp $	*/
+/*	$OpenBSD: endgame.c,v 1.9 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: endgame.c,v 1.3 1995/03/23 08:32:40 cgd Exp $	*/
 
 /*
@@ -30,9 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/ttydefaults.h>
-
 #include <curses.h>
+#include <termios.h>
 
 #include "hangman.h"
 
diff --git a/games/hangman/getguess.c b/games/hangman/getguess.c
index 5627538f000..48d70adca88 100644
--- a/games/hangman/getguess.c
+++ b/games/hangman/getguess.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getguess.c,v 1.14 2015/12/31 15:20:36 mestre Exp $	*/
+/*	$OpenBSD: getguess.c,v 1.15 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: getguess.c,v 1.5 1995/03/23 08:32:43 cgd Exp $	*/
 
 /*
@@ -30,10 +30,9 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/ttydefaults.h>
-
 #include <ctype.h>
 #include <curses.h>
+#include <termios.h>
 #include <unistd.h>
 
 #include "hangman.h"
diff --git a/games/morse/morse.c b/games/morse/morse.c
index ba5eba7725e..b11b5c6141e 100644
--- a/games/morse/morse.c
+++ b/games/morse/morse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: morse.c,v 1.17 2015/10/23 02:01:15 jsg Exp $	*/
+/*	$OpenBSD: morse.c,v 1.18 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -30,11 +30,11 @@
  */
 
 #include <ctype.h>
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <err.h>
 
 static char
 	*digit[] = {
diff --git a/games/number/number.c b/games/number/number.c
index d0e97ac40c2..5789ed740b0 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: number.c,v 1.17 2015/12/25 20:59:09 mestre Exp $	*/
+/*	$OpenBSD: number.c,v 1.18 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/games/pig/pig.c b/games/pig/pig.c
index d0a30c724ca..67aa3d71299 100644
--- a/games/pig/pig.c
+++ b/games/pig/pig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pig.c,v 1.14 2015/12/25 20:59:09 mestre Exp $	*/
+/*	$OpenBSD: pig.c,v 1.15 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: pig.c,v 1.2 1995/03/23 08:41:40 cgd Exp $	*/
 
 /*-
@@ -30,8 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/games/pom/pom.c b/games/pom/pom.c
index dc03aa5ce63..4beb4174ab0 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pom.c,v 1.19 2015/12/26 00:26:39 mestre Exp $	*/
+/*	$OpenBSD: pom.c,v 1.20 2016/01/04 17:33:24 mestre Exp $	*/
 /*    $NetBSD: pom.c,v 1.6 1996/02/06 22:47:29 jtc Exp $      */
 
 /*
@@ -44,14 +44,12 @@
  *
  */
 
-#include <sys/time.h>
-#include <sys/types.h>
 #include <ctype.h>
+#include <err.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <err.h>
 #include <unistd.h>
 
 #ifndef M_PI
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index e7a050137cd..82ba8b1e9d9 100644
--- a/games/ppt/ppt.c
+++ b/games/ppt/ppt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppt.c,v 1.14 2015/12/25 20:59:09 mestre Exp $	*/
+/*	$OpenBSD: ppt.c,v 1.15 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: ppt.c,v 1.4 1995/03/23 08:35:40 cgd Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c
index ab89af26034..dd632ec661a 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quiz.c,v 1.25 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: quiz.c,v 1.26 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: quiz.c,v 1.9 1995/04/22 10:16:58 cgd Exp $	*/
 
 /*-
@@ -34,11 +34,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/games/rain/rain.c b/games/rain/rain.c
index a066c5773e5..dca39b85810 100644
--- a/games/rain/rain.c
+++ b/games/rain/rain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rain.c,v 1.19 2015/12/06 11:22:37 tb Exp $	*/
+/*	$OpenBSD: rain.c,v 1.20 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,11 +34,9 @@
  * cc rain.c -o rain -O -ltermlib
  */
 
-#include <sys/types.h>
 #include <curses.h>
 #include <err.h>
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/games/robots/extern.c b/games/robots/extern.c
index 04bc42a3362..d849f866d6e 100644
--- a/games/robots/extern.c
+++ b/games/robots/extern.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.c,v 1.7 2015/08/26 00:29:24 rzalamena Exp $	*/
+/*	$OpenBSD: extern.c,v 1.8 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: extern.c,v 1.3 1995/04/22 10:08:49 cgd Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include "robots.h"
 
 bool	Dead;			/* Player is now dead */
 bool	Full_clear = TRUE;	/* Lots of junk for init_field to clear */
diff --git a/games/robots/init_field.c b/games/robots/init_field.c
index 52bde5dd8e0..d2b8cff04f7 100644
--- a/games/robots/init_field.c
+++ b/games/robots/init_field.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_field.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $	*/
+/*	$OpenBSD: init_field.c,v 1.8 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: init_field.c,v 1.3 1995/04/22 10:08:52 cgd Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include "robots.h"
 
 /*
  * init_field:
diff --git a/games/robots/main.c b/games/robots/main.c
index 3093deb4a6d..0d903f43690 100644
--- a/games/robots/main.c
+++ b/games/robots/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.22 2015/12/04 16:40:09 tb Exp $	*/
+/*	$OpenBSD: main.c,v 1.23 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1995/04/22 10:08:54 cgd Exp $	*/
 
 /*
@@ -30,7 +30,15 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "robots.h"
 
 void
 usage(void)
diff --git a/games/robots/make_level.c b/games/robots/make_level.c
index 03f34e2d331..fa7befcebd1 100644
--- a/games/robots/make_level.c
+++ b/games/robots/make_level.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: make_level.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $	*/
+/*	$OpenBSD: make_level.c,v 1.8 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: make_level.c,v 1.3 1995/04/22 10:08:56 cgd Exp $	*/
 
 /*
@@ -30,7 +30,9 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include <string.h>
+
+#include "robots.h"
 
 /*
  * make_level:
diff --git a/games/robots/move.c b/games/robots/move.c
index fa46520d478..61be0037127 100644
--- a/games/robots/move.c
+++ b/games/robots/move.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: move.c,v 1.11 2015/08/26 00:29:24 rzalamena Exp $	*/
+/*	$OpenBSD: move.c,v 1.12 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: move.c,v 1.4 1995/04/22 10:08:58 cgd Exp $	*/
 
 /*
@@ -30,6 +30,11 @@
  * SUCH DAMAGE.
  */
 
+#include <ctype.h>
+#include <poll.h>
+#include <termios.h>
+#include <unistd.h>
+
 #include "robots.h"
 
 #define	ESC	'\033'
diff --git a/games/robots/move_robs.c b/games/robots/move_robs.c
index 3939218019d..666743dfcf9 100644
--- a/games/robots/move_robs.c
+++ b/games/robots/move_robs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: move_robs.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $	*/
+/*	$OpenBSD: move_robs.c,v 1.9 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: move_robs.c,v 1.3 1995/04/22 10:08:59 cgd Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include "robots.h"
 
 /*
  * move_robots:
diff --git a/games/robots/play_level.c b/games/robots/play_level.c
index 48e9476a1ab..3c65c8cfdb3 100644
--- a/games/robots/play_level.c
+++ b/games/robots/play_level.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: play_level.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $	*/
+/*	$OpenBSD: play_level.c,v 1.10 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: play_level.c,v 1.3 1995/04/22 10:09:03 cgd Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-# include	"robots.h"
+#include "robots.h"
 
 /*
  * play_level:
diff --git a/games/robots/query.c b/games/robots/query.c
index 6f98081b549..44f180ba5c2 100644
--- a/games/robots/query.c
+++ b/games/robots/query.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: query.c,v 1.6 2009/10/27 23:59:26 deraadt Exp $	*/
+/*	$OpenBSD: query.c,v 1.7 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: query.c,v 1.3 1995/04/22 10:09:05 cgd Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include "robots.h"
 
 /*
  * query:
diff --git a/games/robots/rnd_pos.c b/games/robots/rnd_pos.c
index 9ca16206fc4..f2feadc149d 100644
--- a/games/robots/rnd_pos.c
+++ b/games/robots/rnd_pos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rnd_pos.c,v 1.6 2013/08/29 20:22:19 naddy Exp $	*/
+/*	$OpenBSD: rnd_pos.c,v 1.7 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -29,7 +29,9 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include <stdlib.h>
+
+#include "robots.h"
 
 #define	IS_SAME(p,y,x)	((p).y != -1 && (p).y == y && (p).x == x)
 
diff --git a/games/robots/robots.h b/games/robots/robots.h
index 8f2ff8264de..8db91cd4a22 100644
--- a/games/robots/robots.h
+++ b/games/robots/robots.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: robots.h,v 1.13 2015/12/26 00:26:39 mestre Exp $	*/
+/*	$OpenBSD: robots.h,v 1.14 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: robots.h,v 1.5 1995/04/24 12:24:54 cgd Exp $	*/
 
 /*
@@ -32,20 +32,8 @@
  *	@(#)robots.h	8.1 (Berkeley) 5/31/93
  */
 
-#include	<sys/types.h>
-#include	<sys/time.h>
-#include	<ctype.h>
-#include	<curses.h>
-#include	<err.h>
-#include	<errno.h>
-#include	<fcntl.h>
-#include	<limits.h>
-#include	<signal.h>
-#include	<string.h>
-#include	<stdlib.h>
-#include	<termios.h>
-#include	<unistd.h>
-#include	<poll.h>
+#include <curses.h>
+#include <limits.h>
 
 /*
  * miscellaneous constants
diff --git a/games/robots/score.c b/games/robots/score.c
index 8eeeb06d943..3903a5ab0cd 100644
--- a/games/robots/score.c
+++ b/games/robots/score.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: score.c,v 1.13 2015/12/04 16:40:09 tb Exp $	*/
+/*	$OpenBSD: score.c,v 1.14 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: score.c,v 1.3 1995/04/22 10:09:12 cgd Exp $	*/
 
 /*
@@ -30,7 +30,12 @@
  * SUCH DAMAGE.
  */
 
-#include	"robots.h"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "robots.h"
 
 char	Scorefile[PATH_MAX];
 
diff --git a/games/snake/snake.c b/games/snake/snake.c
index 62cfcc2ae00..96dad57e9dc 100644
--- a/games/snake/snake.c
+++ b/games/snake/snake.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snake.c,v 1.21 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: snake.c,v 1.22 2016/01/04 17:33:24 mestre Exp $	*/
 /*	$NetBSD: snake.c,v 1.8 1995/04/29 00:06:41 mycroft Exp $	*/
 
 /*
@@ -41,9 +41,6 @@
  *	cc -O snake.c move.c -o snake -lm -lcurses
  */
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
 #include <curses.h>
 #include <err.h>
 #include <errno.h>
@@ -51,7 +48,6 @@
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
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,
diff --git a/games/worm/worm.c b/games/worm/worm.c
index 731b83a94e7..176d3229922 100644
--- a/games/worm/worm.c
+++ b/games/worm/worm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: worm.c,v 1.36 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: worm.c,v 1.37 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,16 +34,13 @@
  * UCSC
  */
 
-#include <sys/types.h>
-
 #include <ctype.h>
 #include <curses.h>
 #include <err.h>
+#include <poll.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
-#include <poll.h>
 
 #define HEAD '@'
 #define BODY 'o'
diff --git a/games/worms/worms.c b/games/worms/worms.c
index 98713541431..38253dd7571 100644
--- a/games/worms/worms.c
+++ b/games/worms/worms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: worms.c,v 1.23 2015/11/21 05:29:42 deraadt Exp $	*/
+/*	$OpenBSD: worms.c,v 1.24 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -46,12 +46,9 @@
  *				 October, 1980
  *
  */
-#include <sys/types.h>
-
 #include <curses.h>
 #include <err.h>
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/games/wump/wump.c b/games/wump/wump.c
index 0c74eeac06b..3720e02cc38 100644
--- a/games/wump/wump.c
+++ b/games/wump/wump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wump.c,v 1.29 2016/01/03 14:38:17 mestre Exp $	*/
+/*	$OpenBSD: wump.c,v 1.30 2016/01/04 17:33:24 mestre Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,6 @@
  * would care to remember.
  */
 
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include <err.h>