Remove unnecessary headers and sort the remaining alphabetically

OK tb@

43 files changed, 121 insertions, 84 deletions

diff --git a/games/trek/abandon.c b/games/trek/abandon.c
index f95e2bf0ea4..376c6dc25d0 100644
--- a/games/trek/abandon.c
+++ b/games/trek/abandon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: abandon.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: abandon.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: abandon.c,v 1.3 1995/04/22 10:58:24 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/attack.c b/games/trek/attack.c
index 49774555a4e..21ca2634464 100644
--- a/games/trek/attack.c
+++ b/games/trek/attack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: attack.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: attack.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: attack.c,v 1.3 1995/04/22 10:58:26 cgd Exp $	*/
 
 /*
@@ -30,8 +30,9 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/autover.c b/games/trek/autover.c
index f18a776c2a9..7aef24fe14e 100644
--- a/games/trek/autover.c
+++ b/games/trek/autover.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autover.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: autover.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: autover.c,v 1.3 1995/04/22 10:58:28 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/capture.c b/games/trek/capture.c
index 6506ad3f700..d20dc3fdc85 100644
--- a/games/trek/capture.c
+++ b/games/trek/capture.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: capture.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: capture.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: capture.c,v 1.3 1995/04/22 10:58:32 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/check_out.c b/games/trek/check_out.c
index 226c34cb471..161fdd88490 100644
--- a/games/trek/check_out.c
+++ b/games/trek/check_out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_out.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: check_out.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: check_out.c,v 1.3 1995/04/22 10:58:35 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/compkl.c b/games/trek/compkl.c
index 6a6abbaf9af..eba6475d953 100644
--- a/games/trek/compkl.c
+++ b/games/trek/compkl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compkl.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: compkl.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: compkl.c,v 1.3 1995/04/22 10:58:38 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <math.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/computer.c b/games/trek/computer.c
index b0fe5eff2c9..174990f6eb0 100644
--- a/games/trek/computer.c
+++ b/games/trek/computer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: computer.c,v 1.10 2013/06/02 04:28:39 schwarze Exp $	*/
+/*	$OpenBSD: computer.c,v 1.11 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: computer.c,v 1.4 1995/04/24 12:25:51 cgd Exp $	*/
 
 /*
@@ -30,11 +30,12 @@
  * SUCH DAMAGE.
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  On-Board Computer
diff --git a/games/trek/damage.c b/games/trek/damage.c
index 40ec118d462..533e05a203b 100644
--- a/games/trek/damage.c
+++ b/games/trek/damage.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: damage.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: damage.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: damage.c,v 1.3 1995/04/22 10:58:40 cgd Exp $	*/
 
 /*
@@ -30,8 +30,9 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <err.h>
+#include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/dcrept.c b/games/trek/dcrept.c
index 38e60e02326..4d2e22ae76f 100644
--- a/games/trek/dcrept.c
+++ b/games/trek/dcrept.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcrept.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: dcrept.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: dcrept.c,v 1.3 1995/04/22 10:58:43 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/destruct.c b/games/trek/destruct.c
index 646c5495727..cc58e93b050 100644
--- a/games/trek/destruct.c
+++ b/games/trek/destruct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: destruct.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: destruct.c,v 1.8 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: destruct.c,v 1.3 1995/04/22 10:58:44 cgd Exp $	*/
 
 /*
@@ -33,8 +33,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  Self Destruct Sequence
diff --git a/games/trek/dock.c b/games/trek/dock.c
index 9414ae85802..8030bbc4670 100644
--- a/games/trek/dock.c
+++ b/games/trek/dock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dock.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: dock.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: dock.c,v 1.3 1995/04/22 10:58:45 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/dumpgame.c b/games/trek/dumpgame.c
index 4ea4a09995c..67bd485a5e5 100644
--- a/games/trek/dumpgame.c
+++ b/games/trek/dumpgame.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumpgame.c,v 1.10 2015/11/11 01:12:10 deraadt Exp $	*/
+/*	$OpenBSD: dumpgame.c,v 1.11 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: dumpgame.c,v 1.4 1995/04/24 12:25:54 cgd Exp $	*/
 
 /*
@@ -30,10 +30,11 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <err.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "trek.h"
 
 /***  THIS CONSTANT MUST CHANGE AS THE DATA SPACES CHANGE ***/
diff --git a/games/trek/dumpme.c b/games/trek/dumpme.c
index dbf25752565..155386fa88e 100644
--- a/games/trek/dumpme.c
+++ b/games/trek/dumpme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumpme.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: dumpme.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: dumpme.c,v 1.3 1995/04/22 10:58:48 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/dumpssradio.c b/games/trek/dumpssradio.c
index 95a8c3eab1c..585a13b6c87 100644
--- a/games/trek/dumpssradio.c
+++ b/games/trek/dumpssradio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumpssradio.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: dumpssradio.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: dumpssradio.c,v 1.3 1995/04/22 10:58:49 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /**
diff --git a/games/trek/events.c b/games/trek/events.c
index 23024c4fdf6..dfbdc985a9c 100644
--- a/games/trek/events.c
+++ b/games/trek/events.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: events.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: events.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: events.c,v 1.3 1995/04/22 10:58:50 cgd Exp $	*/
 
 /*
@@ -30,9 +30,10 @@
  * SUCH DAMAGE.
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <math.h>
+
 #include "getpar.h"
 #include "trek.h"
 
diff --git a/games/trek/getpar.c b/games/trek/getpar.c
index c4f036c1ff7..9e719a05de8 100644
--- a/games/trek/getpar.c
+++ b/games/trek/getpar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getpar.c,v 1.13 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: getpar.c,v 1.14 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: getpar.c,v 1.4 1995/04/24 12:25:57 cgd Exp $	*/
 
 /*
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "getpar.h"
 #include "trek.h"
 
diff --git a/games/trek/help.c b/games/trek/help.c
index 6c2789c79fa..f214b129798 100644
--- a/games/trek/help.c
+++ b/games/trek/help.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: help.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: help.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: help.c,v 1.3 1995/04/22 10:59:01 cgd Exp $	*/
 
 /*
@@ -30,9 +30,10 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
 #include <unistd.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/impulse.c b/games/trek/impulse.c
index 5e81ecf8a73..6f1423c39a7 100644
--- a/games/trek/impulse.c
+++ b/games/trek/impulse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: impulse.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: impulse.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: impulse.c,v 1.3 1995/04/22 10:59:03 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /**
  **	move under impulse power
diff --git a/games/trek/initquad.c b/games/trek/initquad.c
index 443fce043a1..f55eb690792 100644
--- a/games/trek/initquad.c
+++ b/games/trek/initquad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: initquad.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: initquad.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: initquad.c,v 1.3 1995/04/22 10:59:04 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/kill.c b/games/trek/kill.c
index e28c1d9c72c..4a051fdc7f2 100644
--- a/games/trek/kill.c
+++ b/games/trek/kill.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kill.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: kill.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: kill.c,v 1.3 1995/04/22 10:59:06 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/klmove.c b/games/trek/klmove.c
index 1af621ba971..3d89a7cbcc8 100644
--- a/games/trek/klmove.c
+++ b/games/trek/klmove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: klmove.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: klmove.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: klmove.c,v 1.3 1995/04/22 10:59:07 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/lose.c b/games/trek/lose.c
index 15a30fea94d..0e07e8fcdc2 100644
--- a/games/trek/lose.c
+++ b/games/trek/lose.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lose.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: lose.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: lose.c,v 1.3 1995/04/22 10:59:08 cgd Exp $	*/
 
 /*
@@ -30,11 +30,12 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <setjmp.h>
+#include <stdio.h>
 #include <unistd.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  PRINT OUT LOSER MESSAGES
diff --git a/games/trek/lrscan.c b/games/trek/lrscan.c
index 316ede8525d..ec57d7b3d03 100644
--- a/games/trek/lrscan.c
+++ b/games/trek/lrscan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lrscan.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: lrscan.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: lrscan.c,v 1.3 1995/04/22 10:59:09 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/main.c b/games/trek/main.c
index 3b84ce83eac..da12915fe3b 100644
--- a/games/trek/main.c
+++ b/games/trek/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.14 2015/11/30 08:55:26 tb Exp $	*/
+/*	$OpenBSD: main.c,v 1.15 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: main.c,v 1.4 1995/04/22 10:59:10 cgd Exp $	*/
 
 /*
@@ -30,15 +30,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <stdio.h>
+#include <err.h>
 #include <setjmp.h>
-#include <termios.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <err.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **	 ####  #####	#    ####	   #####  ####	 #####	#   #
diff --git a/games/trek/move.c b/games/trek/move.c
index 041f86c836f..f56e29b6290 100644
--- a/games/trek/move.c
+++ b/games/trek/move.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: move.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: move.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: move.c,v 1.3 1995/04/22 10:59:12 cgd Exp $	*/
 
 /*
@@ -30,8 +30,9 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/nova.c b/games/trek/nova.c
index 67f700bc50a..ed3fcb3570c 100644
--- a/games/trek/nova.c
+++ b/games/trek/nova.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nova.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: nova.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: nova.c,v 1.3 1995/04/22 10:59:14 cgd Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/out.c b/games/trek/out.c
index 124fd57dd25..00a20014d8c 100644
--- a/games/trek/out.c
+++ b/games/trek/out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: out.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: out.c,v 1.8 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: out.c,v 1.3 1995/04/22 10:59:16 cgd Exp $	*/
 
 /*
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/phaser.c b/games/trek/phaser.c
index 49691206e66..dcbe6f63ac1 100644
--- a/games/trek/phaser.c
+++ b/games/trek/phaser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: phaser.c,v 1.8 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: phaser.c,v 1.9 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: phaser.c,v 1.4 1995/04/24 12:26:02 cgd Exp $	*/
 
 /*
@@ -30,10 +30,11 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <math.h>
-#include "trek.h"
+#include <stdio.h>
+
 #include "getpar.h"
+#include "trek.h"
 
 /* factors for phaser hits; see description below */
 
diff --git a/games/trek/play.c b/games/trek/play.c
index 12303c59c21..011028d9337 100644
--- a/games/trek/play.c
+++ b/games/trek/play.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: play.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: play.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: play.c,v 1.3 1995/04/22 10:59:18 cgd Exp $	*/
 
 /*
@@ -30,10 +30,11 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <setjmp.h>
-#include "trek.h"
+#include <stdio.h>
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  INSTRUCTION READ AND MAIN PLAY LOOP
diff --git a/games/trek/ram.c b/games/trek/ram.c
index 5d743ee778b..8779556c13b 100644
--- a/games/trek/ram.c
+++ b/games/trek/ram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ram.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: ram.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: ram.c,v 1.3 1995/04/22 10:59:19 cgd Exp $	*/
 
 /*
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/ranf.c b/games/trek/ranf.c
index 8e570eeb132..7346a9c423f 100644
--- a/games/trek/ranf.c
+++ b/games/trek/ranf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ranf.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: ranf.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: ranf.c,v 1.3 1995/04/22 10:59:21 cgd Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 
 int
diff --git a/games/trek/rest.c b/games/trek/rest.c
index 8c49aca48e9..54c5856ee20 100644
--- a/games/trek/rest.c
+++ b/games/trek/rest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rest.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: rest.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: rest.c,v 1.3 1995/04/22 10:59:22 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  REST FOR REPAIRS
diff --git a/games/trek/schedule.c b/games/trek/schedule.c
index 68a99109836..8cb1bd9c91a 100644
--- a/games/trek/schedule.c
+++ b/games/trek/schedule.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: schedule.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: schedule.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: schedule.c,v 1.3 1995/04/22 10:59:23 cgd Exp $	*/
 
 /*
@@ -30,9 +30,10 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <math.h>
 #include <err.h>
+#include <math.h>
+#include <stdio.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/score.c b/games/trek/score.c
index 63a6ef6011d..c394b5d92d9 100644
--- a/games/trek/score.c
+++ b/games/trek/score.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: score.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: score.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: score.c,v 1.3 1995/04/22 10:59:24 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  PRINT OUT THE CURRENT SCORE
diff --git a/games/trek/setup.c b/games/trek/setup.c
index 217a15192e2..419ee723ff1 100644
--- a/games/trek/setup.c
+++ b/games/trek/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.10 2014/12/08 21:56:28 deraadt Exp $	*/
+/*	$OpenBSD: setup.c,v 1.11 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: setup.c,v 1.4 1995/04/24 12:26:06 cgd Exp $	*/
 
 /*
@@ -30,14 +30,14 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <err.h>
 #include <math.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  INITIALIZE THE GAME
diff --git a/games/trek/setwarp.c b/games/trek/setwarp.c
index c5af78c4b3b..f6d8fbbe6a3 100644
--- a/games/trek/setwarp.c
+++ b/games/trek/setwarp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setwarp.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: setwarp.c,v 1.5 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: setwarp.c,v 1.3 1995/04/22 10:59:27 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  SET WARP FACTOR
diff --git a/games/trek/shield.c b/games/trek/shield.c
index 07dc344e5bd..366d2b3d338 100644
--- a/games/trek/shield.c
+++ b/games/trek/shield.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shield.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: shield.c,v 1.8 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: shield.c,v 1.4 1995/04/24 12:26:09 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  SHIELD AND CLOAKING DEVICE CONTROL
diff --git a/games/trek/snova.c b/games/trek/snova.c
index 8ac6df4f011..d4bfa5bf565 100644
--- a/games/trek/snova.c
+++ b/games/trek/snova.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snova.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: snova.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: snova.c,v 1.3 1995/04/22 10:59:29 cgd Exp $	*/
 
 /*
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+
 #include "trek.h"
 
 /*
diff --git a/games/trek/srscan.c b/games/trek/srscan.c
index e32e4b584f0..b90f3c53f7c 100644
--- a/games/trek/srscan.c
+++ b/games/trek/srscan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: srscan.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: srscan.c,v 1.8 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: srscan.c,v 1.3 1995/04/22 10:59:31 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  SHORT RANGE SENSOR SCAN
diff --git a/games/trek/torped.c b/games/trek/torped.c
index 1285df7a3ba..3c9682e20f9 100644
--- a/games/trek/torped.c
+++ b/games/trek/torped.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: torped.c,v 1.8 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: torped.c,v 1.9 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: torped.c,v 1.3 1995/04/22 10:59:34 cgd Exp $	*/
 
 /*
@@ -30,11 +30,12 @@
  * SUCH DAMAGE.
  */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 static int randcourse(int);
 
diff --git a/games/trek/visual.c b/games/trek/visual.c
index bb997fdaa50..41b66e8cac3 100644
--- a/games/trek/visual.c
+++ b/games/trek/visual.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: visual.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: visual.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: visual.c,v 1.3 1995/04/22 10:59:39 cgd Exp $	*/
 
 /*
@@ -31,8 +31,9 @@
  */
 
 #include <stdio.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  VISUAL SCAN
diff --git a/games/trek/warp.c b/games/trek/warp.c
index 837b8855314..e1a7e5a724c 100644
--- a/games/trek/warp.c
+++ b/games/trek/warp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: warp.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: warp.c,v 1.7 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: warp.c,v 1.3 1995/04/22 10:59:40 cgd Exp $	*/
 
 /*
@@ -31,11 +31,11 @@
  */
 
 #include <stdio.h>
-#include <math.h>
 #include <string.h>
 #include <unistd.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  MOVE UNDER WARP POWER
diff --git a/games/trek/win.c b/games/trek/win.c
index 31f93c75574..9a49e934a93 100644
--- a/games/trek/win.c
+++ b/games/trek/win.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: win.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: win.c,v 1.6 2016/01/07 14:30:32 mestre Exp $	*/
 /*	$NetBSD: win.c,v 1.3 1995/04/22 10:59:41 cgd Exp $	*/
 
 /*
@@ -30,11 +30,12 @@
  * SUCH DAMAGE.
  */
 
+#include <setjmp.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <setjmp.h>
-#include "trek.h"
+
 #include "getpar.h"
+#include "trek.h"
 
 /*
 **  Signal game won