Break inclusion cycle: prototypes.h and commands.h included each

other.  Ensure headers in include/ can be included in any order
(except for econfig-spec.h, which is special).  New header types.h to
help avoid inclusion cycles.  Sort include directives.  Remove some
superflous includes.

src/lib/commands/acce.c

@@ -33,11 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/add.c

@@ -33,20 +33,12 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "tel.h"
-#include "land.h"
+#include <fcntl.h>
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "plague.h"
+#include "tel.h"
 
 int
 add(void)

src/lib/commands/anti.c

@@ -34,17 +34,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
+#include "lost.h"
 #include "optlist.h"
 
 /*

src/lib/commands/arm.c

@@ -36,16 +36,10 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
 #include "optlist.h"
+#include "plane.h"
 
 int
 arm(void)

src/lib/commands/army.c

@@ -34,12 +34,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 
 int
 army(void)

src/lib/commands/assa.c

@@ -34,18 +34,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "ship.h"
 
 int
 assa(void)

src/lib/commands/atta.c

@@ -35,19 +35,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "ship.h"
 
 int
 atta(void)

src/lib/commands/bdes.c

@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
+#include <ctype.h>
 #include "commands.h"
+#include "map.h"
+#include "path.h"
 
 int
 bdes(void)

src/lib/commands/best.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "path.h"
 
 int
 best(void)

src/lib/commands/boar.c

@@ -33,20 +33,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
-#include "retreat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "retreat.h"
+#include "ship.h"
 
 int
 boar(void)

src/lib/commands/bomb.c

@@ -36,24 +36,16 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
+#include "commands.h"
+#include "damage.h"
 #include "item.h"
+#include "land.h"
+#include "news.h"
+#include "optlist.h"
+#include "path.h"
 #include "plane.h"
 #include "retreat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "news.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
-#include "optlist.h"
-#include "damage.h"
-#include "commands.h"
+#include "ship.h"
 
 static void pin_bomb(struct emp_qelem *list, struct sctstr *target);
 static void strat_bomb(struct emp_qelem *list, struct sctstr *target);

src/lib/commands/brea.c

@@ -33,10 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
 
 int

src/lib/commands/budg.c

@@ -36,22 +36,15 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
-#include "item.h"
-#include "file.h"
-#include "ship.h"
-#include "land.h"
-#include "plane.h"
-#include "optlist.h"
+#include <ctype.h>
 #include "budg.h"
 #include "commands.h"
+#include "item.h"
+#include "land.h"
+#include "optlist.h"
+#include "plane.h"
+#include "product.h"
+#include "ship.h"
 
 static void calc_all(long (*p_sect)[2], int *taxes, int *Ncivs,
 		     int *Nuws, int *bars, int *Nbars, int *mil,

src/lib/commands/buil.c

@@ -35,23 +35,17 @@
 #include <config.h>
 
 #include <limits.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
-#include "land.h"
-#include "nuke.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "treaty.h"
-#include "file.h"
-#include "path.h"
-#include "optlist.h"
 #include "commands.h"
+#include "land.h"
+#include "lost.h"
+#include "map.h"
+#include "nuke.h"
+#include "optlist.h"
+#include "path.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
+#include "treaty.h"
 
 static int build_nuke(struct sctstr *sp,
 		      struct nchrstr *np, short *vec, int tlev);

src/lib/commands/buy.c

@@ -35,23 +35,16 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "file.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
+#include "commands.h"
+#include "commodity.h"
 #include "item.h"
 #include "land.h"
-#include "commodity.h"
+#include "loan.h"
+#include "news.h"
+#include "optlist.h"
 #include "plane.h"
 #include "ship.h"
 #include "trade.h"
-#include "player.h"
-#include "loan.h"
-#include "commands.h"
-#include "optlist.h"
 
 /*
  * format: buy <COMMODITY>

src/lib/commands/capi.c

@@ -34,13 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 int

src/lib/commands/carg.c

@@ -33,15 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 carg(void)

src/lib/commands/cede.c

@@ -34,19 +34,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "plane.h"
-#include "land.h"
-#include "ship.h"
-#include "nuke.h"
 #include "commands.h"
+#include "land.h"
+#include "lost.h"
+#include "nuke.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static void cede_hdr(void);
 static int cede_sect(struct nstr_sect *, natid);

src/lib/commands/cens.c

@@ -33,10 +33,9 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
 static void cens_hdr(void);
 

src/lib/commands/chan.c

@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
+#include "commands.h"
 #include "news.h"
 #include "optlist.h"
-#include "commands.h"
+#include <ctype.h>
 
 int
 chan(void)

src/lib/commands/coas.c

@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 #define	TSIZE	200
 

src/lib/commands/coll.c

@@ -34,16 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
 #include "loan.h"
+#include "lost.h"
 #include "news.h"
-#include "nat.h"
-#include "xy.h"
-#include "commands.h"
 #include "optlist.h"
 
 int

src/lib/commands/comm.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
-#include "nat.h"
 #include "commands.h"
+#include "path.h"
 
 static void prthresh(int val);
 

src/lib/commands/cons.c

@@ -33,17 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "loan.h"
-#include "nat.h"
-#include "treaty.h"
-#include "news.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "loan.h"
+#include "news.h"
 #include "optlist.h"
+#include "treaty.h"
 
 /*
  * Things common to a loan or treaty.

src/lib/commands/conv.c

@@ -37,15 +37,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "land.h"
 #include "commands.h"
+#include "land.h"
 
 static long do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real);
 

src/lib/commands/coun.c

@@ -33,15 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include <fcntl.h>
-#include <ctype.h>
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/cuto.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "path.h"
 
 int
 cuto(void)

src/lib/commands/decl.c

@@ -33,12 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/deli.c

@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "item.h"
-#include "file.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "item.h"
+#include "path.h"
 
 int
 deli(void)

src/lib/commands/demo.c

@@ -33,13 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 /*

src/lib/commands/desi.c

@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
 #include "commands.h"
+#include "map.h"
+#include "optlist.h"
+#include "path.h"
 
 static long do_desi(struct natstr *natp, char *sects, char *deschar,
 		    long cash, int for_real);

src/lib/commands/disa.c

@@ -34,7 +34,9 @@
 #include <config.h>
 
 #include <fcntl.h>
-#include "misc.h"
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/dist.c

@@ -35,15 +35,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "path.h"
 #include "commands.h"
+#include "path.h"
 
 /*
  * distribute <SECT> <DISTSECT|.|h>

src/lib/commands/drop.c

@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "item.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 drop(void)

src/lib/commands/dump.c

@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
 int
 dump(void)

src/lib/commands/echo.c

@@ -33,8 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 
 int

src/lib/commands/edit.c

@@ -39,23 +39,15 @@
 
 #include <ctype.h>
 #include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
+#include "land.h"
+#include "lost.h"
+#include "news.h"
+#include "optlist.h"
+#include "plague.h"
 #include "plane.h"
 #include "ship.h"
-#include "land.h"
-#include "optlist.h"
-#include "commands.h"
 
 #define END -1
 

src/lib/commands/enab.c

@@ -33,9 +33,9 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <fcntl.h>
-#include "misc.h"
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/enli.c

@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "treaty.h"
-#include "file.h"
 #include "commands.h"
+#include "treaty.h"
 
 int
 enli(void)

src/lib/commands/expl.c

@@ -33,17 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
 #include "commands.h"
+#include "item.h"
+#include "map.h"
+#include "optlist.h"
+#include "plague.h"
 
 static int explore_map(coord curx, coord cury, char *arg);
 

src/lib/commands/fina.c

@@ -35,14 +35,8 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "loan.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
 
 /*

src/lib/commands/flash.c

@@ -34,11 +34,6 @@
 
 #include <config.h>
 
-#include <time.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
 
 int

src/lib/commands/flee.c

@@ -34,12 +34,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "ship.h"
 
 int
 flee(void)

src/lib/commands/fly.c

@@ -34,18 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "item.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 fly(void)

src/lib/commands/foll.c

@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
+#include <ctype.h>
 
 int
 foll(void)

src/lib/commands/forc.c

@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include "misc.h"
-#include "player.h"
-#include "empthread.h"
 #include "commands.h"
+#include "empthread.h"
 #include "server.h"
 
 int

src/lib/commands/fort.c

@@ -33,12 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
 
 int

src/lib/commands/fuel.c

@@ -33,15 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
+#include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
+#include "optlist.h"
+#include "plague.h"
 
 int
 fuel(void)

src/lib/commands/give.c

@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "xy.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
+#include "news.h"
 #include "optlist.h"
 
 /*

src/lib/commands/grin.c

@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "product.h"
 #include "commands.h"
+#include "product.h"
 
 int
 grin(void)

src/lib/commands/hard.c

@@ -33,17 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
 #include "plane.h"
 #include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "commands.h"
 
 /*
  * harden <PLANE> <LEVEL>

src/lib/commands/head.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "news.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
+#include "news.h"
 
 struct histstr {
     int h_past;

src/lib/commands/improve.c

@@ -33,17 +33,9 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "optlist.h"
+#include "path.h"
 
 int
 improve(void)

src/lib/commands/info.c

@@ -37,18 +37,14 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <errno.h>
-#include <string.h>
-#include <stdio.h>
 #include <sys/stat.h>
-#include <time.h>
 #if !defined(_WIN32)
 #include <dirent.h>
 #else
 #include <windows.h>
 #endif
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 #include "optlist.h"
 

src/lib/commands/land.c

@@ -33,14 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "land.h"
+#include "optlist.h"
 
 int
 land(void)

src/lib/commands/laun.c

@@ -35,21 +35,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "plane.h"
-#include "news.h"
-#include "mission.h"
-#include "ship.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "optlist.h"
-#include "damage.h"
 #include "commands.h"
+#include "damage.h"
+#include "mission.h"
+#include "news.h"
+#include "optlist.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static int launch_as(struct plnstr *pp);
 static int launch_missile(struct plnstr *pp, int sublaunch);

src/lib/commands/lboard.c

@@ -33,19 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "ship.h"
 
 int
 lboa(void)

src/lib/commands/ldump.c

@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "land.h"
+#include "optlist.h"
 
 int
 ldump(void)

src/lib/commands/ledg.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "loan.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
 
 int

src/lib/commands/leve.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "path.h"
 
 int
 leve(void)

src/lib/commands/load.c

@@ -35,21 +35,15 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "file.h"
-#include "plague.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
-#include "land.h"
-#include "item.h"
-#include "nsc.h"
-#include "nat.h"
-#include "optlist.h"
+#include <ctype.h>
 #include "commands.h"
+#include "empobj.h"
+#include "item.h"
+#include "land.h"
+#include "optlist.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
 
 /*
  * The values 1 and -1 are important below, don't change them.

src/lib/commands/look.c

@@ -33,20 +33,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
-#include "plane.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include <fcntl.h>
 #include "commands.h"
+#include "land.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static void look_ship(struct shpstr *lookship);
 static void look_land(struct lndstr *lookland);

src/lib/commands/lost.c

@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include "player.h"
-#include "nsc.h"
-#include "file.h"
-#include "lost.h"
 #include "commands.h"
+#include "lost.h"
 
 int
 lost(void)

src/lib/commands/lstat.c

@@ -33,12 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 
 int
 lsta(void)

src/lib/commands/lten.c

@@ -37,16 +37,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "file.h"
-#include "ship.h"
-#include "item.h"
-#include "nsc.h"
-#include "plane.h"
-#include "land.h"
 #include "commands.h"
+#include "item.h"
+#include "land.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
 
 static void expose_land(struct shpstr *s1, struct lndstr *l1);
 

src/lib/commands/map.c

@@ -34,17 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
-#include "player.h"
-#include "map.h"
-#include "ship.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
+#include "land.h"
+#include "map.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 map(void)

src/lib/commands/marc.c

@@ -35,15 +35,11 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
-#include "file.h"
-#include "map.h"
 #include "commands.h"
+#include "file.h"
+#include "land.h"
+#include "map.h"
+#include "path.h"
 
 static int set_leader(struct emp_qelem *list, struct lndstr **leaderp);
 static void switch_leader(struct emp_qelem *list, int land_uid);

src/lib/commands/mark.c

@@ -35,12 +35,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "item.h"
-#include "commodity.h"
-#include "player.h"
-#include "file.h"
 #include "commands.h"
+#include "commodity.h"
+#include "item.h"
 #include "optlist.h"
 
 int

src/lib/commands/mfir.c

@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "retreat.h"
-#include "nsc.h"
-#include "file.h"
-#include "queue.h"
-#include <ctype.h>
-#include "optlist.h"
-#include "damage.h"
 #include "commands.h"
+#include "damage.h"
 #include "empobj.h"
+#include "optlist.h"
+#include "retreat.h"
 
 enum targ_type {
     targ_land, targ_ship, targ_sub, targ_unit, targ_bogus

src/lib/commands/mine.c

@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
+#include "map.h"
+#include "ship.h"
 
 /*
  * format: mine <SHIPS> <NUMBER MINES>

src/lib/commands/miss.c

@@ -34,16 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "path.h"
-#include "mission.h"
 #include "commands.h"
-#include "optlist.h"
 #include "empobj.h"
+#include "mission.h"
+#include "optlist.h"
+#include "path.h"
 
 /*
  *  mission <type> <planes/ships/units> <mission type> <op sector> [<radius>]

src/lib/commands/mobq.c

@@ -34,14 +34,9 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 
 int

src/lib/commands/mobu.c

@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <time.h>
-#include "misc.h"
-#include "player.h"
-#include "nsc.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 #include "server.h"
-#include "prototypes.h"
 
 int
 mobupdate(void)

src/lib/commands/mora.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
 
 int

src/lib/commands/move.c

@@ -33,19 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "item.h"
-#include "file.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
-#include "land.h"
-#include "path.h"
-#include "optlist.h"
 #include "commands.h"
+#include "item.h"
+#include "land.h"
+#include "optlist.h"
+#include "path.h"
+#include "plague.h"
 
 
 static int cmd_move_map(coord curx, coord cury, char *arg);

src/lib/commands/name.c

@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 /*
  * name <SHIP> <NAME>

src/lib/commands/nati.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "sect.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
 #include "commands.h"
+#include "optlist.h"
 
 int
 nati(void)

src/lib/commands/navi.c

@@ -34,18 +34,11 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 static int set_flagship(struct emp_qelem *list, struct shpstr **flagshipp);
 static void switch_flagship(struct emp_qelem *list, int ship_uid);

src/lib/commands/ndump.c

@@ -34,12 +34,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
 
 int
 ndump(void)

src/lib/commands/new.c

@@ -33,20 +33,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "sect.h"
-#include "path.h"
-#include "file.h"
-#include "xy.h"
-#include "tel.h"
-#include "land.h"
-#include "nsc.h"
-#include "optlist.h"
-#include "commands.h"
-
 #include <fcntl.h>
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+#include "commands.h"
+#include "land.h"
+#include "optlist.h"
+#include "path.h"
+#include "tel.h"
 
 static int isok(int x, int y);
 static void ok(signed char *map, int x, int y);

src/lib/commands/newe.c

@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "nat.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
 #include "optlist.h"
 
 int

src/lib/commands/news.c

@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
+#include "news.h"
 #include "optlist.h"
 
 static void preport(struct nwsstr *np);

src/lib/commands/nuke.c

@@ -34,15 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nuke.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
+#include "plane.h"
 
 int
 nuke(void)

src/lib/commands/offe.c

@@ -34,16 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "loan.h"
-#include "treaty.h"
-#include "file.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
+#include "treaty.h"
 
 static int do_treaty(void);
 static int do_loan(void);

src/lib/commands/orde.c

@@ -34,20 +34,12 @@
 
 #include <config.h>
 
-#include <string.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "item.h"
 #include "commands.h"
+#include "item.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 /*
  *  Command syntax:

src/lib/commands/orig.c

@@ -34,12 +34,7 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nat.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
 
 int

src/lib/commands/para.c

@@ -34,21 +34,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "item.h"
-#include "plane.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
-#include "mission.h"
 #include "combat.h"
 #include "commands.h"
+#include "item.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static int paradrop(struct emp_qelem *list, coord x, coord y);
 

src/lib/commands/path.c

@@ -34,17 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
 
 int
 path(void)

src/lib/commands/payo.c

@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 payo(void)

src/lib/commands/pboa.c

@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "file.h"
-#include "sect.h"
-#include "plane.h"
 #include "commands.h"
+#include "plane.h"
 
 int
 pboa(void)

src/lib/commands/pdump.c

@@ -34,16 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "plane.h"
-#include "nsc.h"
-#include "nuke.h"
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
 #include "commands.h"
+#include "nuke.h"
+#include "optlist.h"
+#include "plane.h"
 
 int
 pdump(void)

src/lib/commands/peek.c

@@ -35,12 +35,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
 
 int

src/lib/commands/plan.c

@@ -35,14 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "nsc.h"
-#include "nuke.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "nuke.h"
+#include "optlist.h"
+#include "plane.h"
 
 int
 plan(void)

src/lib/commands/play.c

@@ -34,10 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "nat.h"
 #include "optlist.h"
 #include "commands.h"
 

src/lib/commands/powe.c

@@ -36,24 +36,13 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
-#include "land.h"
-#include "power.h"
-#include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
-
-
-#include <fcntl.h>
+#include "item.h"
+#include "land.h"
+#include "optlist.h"
+#include "plane.h"
+#include "power.h"
+#include "ship.h"
 
 struct powsort {
     float powval;

src/lib/commands/prod.c

@@ -35,17 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
-#include "item.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "item.h"
+#include "optlist.h"
+#include "product.h"
 
 static void prprod(coord, coord, int, double, double, int, char,
 		   double, double, double, char[], int[], int[], int);

src/lib/commands/pstat.c

@@ -33,13 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "plane.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "plane.h"
 
 int
 pstat(void)

src/lib/commands/rada.c

@@ -34,17 +34,10 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 rada(void)

src/lib/commands/rang.c

@@ -33,13 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
+#include "plane.h"
 
 int
 range(void)

src/lib/commands/rea.c

@@ -35,20 +35,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "tel.h"
+#include <ctype.h>
 #include "commands.h"
-#include "optlist.h"
 #include "match.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#if !defined(_WIN32)
-#include <sys/file.h>
-#endif
+#include "optlist.h"
+#include "tel.h"
 
 int
 rea(void)