Clean up superfluous includes

src/lib/commands/acce.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 /*
  * report rejection status of telegrams and treaties.

src/lib/commands/anti.c

@@ -35,7 +35,6 @@
 
 #include "commands.h"
 #include "item.h"
-#include "lost.h"
 #include "optlist.h"
 
 /*

src/lib/commands/assa.c

@@ -35,8 +35,6 @@
 
 #include "combat.h"
 #include "commands.h"
-#include "mission.h"
-#include "path.h"
 #include "empobj.h"
 #include "unit.h"
 

src/lib/commands/atta.c

@@ -36,8 +36,6 @@
 
 #include "combat.h"
 #include "commands.h"
-#include "land.h"
-#include "mission.h"
 #include "path.h"
 #include "ship.h"
 

src/lib/commands/bdes.c

@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "commands.h"
 #include "map.h"
-#include "path.h"
 
 int
 bdes(void)

src/lib/commands/boar.c

@@ -35,8 +35,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "mission.h"
-#include "path.h"
 #include "retreat.h"
 #include "ship.h"
 

src/lib/commands/budg.c

@@ -39,11 +39,8 @@
 #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/buy.c

@@ -37,12 +37,8 @@
 #include "commands.h"
 #include "commodity.h"
 #include "item.h"
-#include "land.h"
-#include "loan.h"
 #include "news.h"
 #include "optlist.h"
-#include "plane.h"
-#include "ship.h"
 #include "trade.h"
 
 /*

src/lib/commands/carg.c

@@ -34,7 +34,6 @@
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int

src/lib/commands/coll.c

@@ -36,7 +36,6 @@
 #include "commands.h"
 #include "item.h"
 #include "loan.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 

src/lib/commands/desi.c

@@ -36,7 +36,6 @@
 #include "commands.h"
 #include "map.h"
 #include "optlist.h"
-#include "path.h"
 
 int
 desi(void)

src/lib/commands/drop.c

@@ -37,7 +37,6 @@
 #include "item.h"
 #include "path.h"
 #include "plane.h"
-#include "ship.h"
 
 int
 drop(void)

src/lib/commands/edit.c

@@ -41,7 +41,6 @@
 #include "commands.h"
 #include "item.h"
 #include "land.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 #include "plague.h"

src/lib/commands/fly.c

@@ -38,7 +38,6 @@
 #include "item.h"
 #include "path.h"
 #include "plane.h"
-#include "ship.h"
 
 int
 fly(void)

src/lib/commands/hard.c

@@ -35,7 +35,6 @@
 #include "commands.h"
 #include "item.h"
 #include "plane.h"
-#include "ship.h"
 
 /*
  * harden <PLANE> <LEVEL>

src/lib/commands/improve.c

@@ -33,8 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
-#include "path.h"
 
 int
 improve(void)

src/lib/commands/land.c

@@ -34,7 +34,6 @@
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 
 int
 land(void)

src/lib/commands/lboard.c

@@ -35,8 +35,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "mission.h"
-#include "path.h"
 #include "ship.h"
 
 int

src/lib/commands/ldump.c

@@ -35,7 +35,6 @@
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 
 int
 ldump(void)

src/lib/commands/leve.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "path.h"
 
 int
 leve(void)

src/lib/commands/lten.c

@@ -40,7 +40,6 @@
 #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

@@ -36,10 +36,7 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "map.h"
-#include "optlist.h"
-#include "ship.h"
 
 int
 map(void)

src/lib/commands/marc.c

@@ -36,10 +36,7 @@
 
 #include "commands.h"
 #include "file.h"
-#include "map.h"
-#include "path.h"
 #include "empobj.h"
-#include "unit.h"
 
 int
 march(void)

src/lib/commands/miss.c

@@ -36,8 +36,6 @@
 
 #include "commands.h"
 #include "mission.h"
-#include "optlist.h"
-#include "path.h"
 #include "unit.h"
 
 static int clear_mission(struct nstr_item *);

src/lib/commands/move.c

@@ -34,7 +34,6 @@
 
 #include "commands.h"
 #include "item.h"
-#include "land.h"
 #include "map.h"
 #include "optlist.h"
 #include "path.h"

src/lib/commands/name.c

@@ -33,8 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
-#include "path.h"
 #include "ship.h"
 
 /*

src/lib/commands/para.c

@@ -37,8 +37,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "item.h"
-#include "land.h"
-#include "mission.h"
 #include "path.h"
 #include "plane.h"
 #include "ship.h"

src/lib/commands/pdump.c

@@ -35,7 +35,6 @@
 
 #include "commands.h"
 #include "nuke.h"
-#include "optlist.h"
 #include "plane.h"
 
 int

src/lib/commands/plan.c

@@ -36,7 +36,6 @@
 
 #include "commands.h"
 #include "nuke.h"
-#include "optlist.h"
 #include "plane.h"
 
 int

src/lib/commands/rada.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 #include "unit.h"
 
 int

src/lib/commands/rang.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "plane.h"
 
 int

src/lib/commands/reco.c

@@ -36,7 +36,6 @@
 #include "commands.h"
 #include "path.h"
 #include "plane.h"
-#include "ship.h"
 
 int
 reco(void)

src/lib/commands/reje.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 int
 reje(void)

src/lib/commands/rese.c

@@ -37,10 +37,7 @@
 #include "commands.h"
 #include "commodity.h"
 #include "item.h"
-#include "land.h"
 #include "optlist.h"
-#include "plane.h"
-#include "ship.h"
 
 int
 rese(void)

src/lib/commands/reso.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "path.h"
 
 static void reso_hdr(void);
 

src/lib/commands/retr.c

@@ -38,7 +38,6 @@
 #include "commands.h"
 #include "empobj.h"
 #include "land.h"
-#include "path.h"
 #include "retreat.h"
 #include "ship.h"
 

src/lib/commands/sdump.c

@@ -34,8 +34,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int

src/lib/commands/sell.c

@@ -38,10 +38,7 @@
 #include "commands.h"
 #include "commodity.h"
 #include "item.h"
-#include "land.h"
 #include "optlist.h"
-#include "plane.h"
-#include "ship.h"
 
 /*
  * format: sell <COMMODITY> <SECTS> <NUMBER> <PRICE>

src/lib/commands/setsect.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 

src/lib/commands/shi.c

@@ -33,8 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int

src/lib/commands/shoo.c

@@ -36,7 +36,6 @@
 #include "item.h"
 #include "land.h"
 #include "news.h"
-#include "path.h"
 
 int
 shoo(void)

src/lib/commands/sstat.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "ship.h"
 
 int

src/lib/commands/stop.c

@@ -37,7 +37,6 @@
 #include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
-#include "path.h"
 
 static int start_stop(int);
 static int start_stop_sector(char *, int);

src/lib/commands/stre.c

@@ -36,7 +36,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "path.h"
 #include "ship.h"
 
 static double units_in_sector(struct combat *def);

src/lib/commands/strv.c

@@ -37,7 +37,6 @@
 #include "item.h"
 #include "land.h"
 #include "optlist.h"
-#include "path.h"
 #include "ship.h"
 
 static void starv_sects(char *range);

src/lib/commands/tend.c

@@ -39,7 +39,6 @@
 #include "item.h"
 #include "land.h"
 #include "plague.h"
-#include "plane.h"
 #include "ship.h"
 
 static void expose_ship(struct shpstr *s1, struct shpstr *s2);

src/lib/commands/torp.c

@@ -38,7 +38,6 @@
 
 #include "commands.h"
 #include "news.h"
-#include "optlist.h"
 #include "retreat.h"
 #include "ship.h"
 

src/lib/commands/tran.c

@@ -34,11 +34,9 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "map.h"
 #include "nuke.h"
 #include "plane.h"
-#include "ship.h"
 
 static int tran_pmap(coord, coord, char *, char *);
 static int tran_nmap(coord, coord, char *, char *);

src/lib/common/conftab.c

@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include "file.h"
 #include "optlist.h"
-#include "product.h"
 #include "prototypes.h"
 #include "xdump.h"
 

src/lib/common/emp_config.c

@@ -50,7 +50,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "file.h"
 #include "misc.h"
 #include "optlist.h"
 #include "prototypes.h"

src/lib/common/file.c

@@ -47,7 +47,6 @@
 #include "file.h"
 #include "match.h"
 #include "misc.h"
-#include "nsc.h"
 #include "prototypes.h"
 
 static int open_locked(char *, int, mode_t);

src/lib/common/game.c

@@ -46,7 +46,6 @@
 #include "file.h"
 #include "game.h"
 #include "optlist.h"
-#include "prototypes.h"
 #include "server.h"
 
 /*

src/lib/common/hap_fact.c

@@ -34,8 +34,6 @@
 
 #include "misc.h"
 #include "nat.h"
-#include "nsc.h"
-#include "player.h"
 #include "prototypes.h"
 #include "xy.h"
 

src/lib/common/res_pop.c

@@ -35,7 +35,6 @@
 
 #include "item.h"
 #include "misc.h"
-#include "nat.h"
 #include "optlist.h"
 #include "prototypes.h"
 #include "sect.h"

src/lib/empthread/io.c

@@ -54,7 +54,6 @@
 #include "file.h"
 #include "ioqueue.h"
 #include "misc.h"
-#include "queue.h"
 
 struct iop {
     int fd;

src/lib/gen/log.c

@@ -41,8 +41,6 @@
 #include <time.h>
 #include <unistd.h>
 #include "misc.h"
-#include "optlist.h"
-#include "player.h"
 #include "prototypes.h"
 
 void (*oops_handler)(void) = abort;

src/lib/lwp/arch.c

@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include "lwp.h"
 #include "lwpint.h"
 
 /*

src/lib/lwp/queue.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <stddef.h>
-#include "lwp.h"
 #include "lwpint.h"
 
 struct lwpProc *

src/lib/player/accept.c

@@ -44,13 +44,11 @@
 
 #include "empio.h"
 #include "empthread.h"
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
 #include "power.h"
-#include "proto.h"
 #include "prototypes.h"
 
 static struct emp_qelem Players;

src/lib/player/dispatch.c

@@ -43,7 +43,6 @@
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "proto.h"
 #include "prototypes.h"
 #include "server.h"
 

src/lib/player/empdis.c

@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "com.h"
-#include "empio.h"
 #include "file.h"
 #include "game.h"
 #include "match.h"
@@ -46,7 +45,6 @@
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "proto.h"
 #include "prototypes.h"
 
 

src/lib/player/init_nats.c

@@ -41,7 +41,6 @@
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
-#include "sect.h"
 
 int
 init_nats(void)

src/lib/player/player.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "com.h"
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
@@ -43,9 +42,7 @@
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "proto.h"
 #include "prototypes.h"
-#include "tel.h"
 
 
 static int command(void);

src/lib/subs/bridgefall.c

@@ -35,9 +35,7 @@
 
 #include "file.h"
 #include "land.h"
-#include "lost.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "optlist.h"

src/lib/subs/damage.c

@@ -41,7 +41,6 @@
 #include "optlist.h"
 #include "plane.h"
 #include "prototypes.h"
-#include "sect.h"
 #include "ship.h"
 
 void

src/lib/subs/detonate.c

@@ -35,7 +35,6 @@
 
 #include "file.h"
 #include "land.h"
-#include "lost.h"
 #include "map.h"
 #include "misc.h"
 #include "nat.h"

src/lib/subs/getele.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "player.h"
 #include "prototypes.h"
 #include "tel.h"
 

src/lib/subs/mission.c

@@ -44,7 +44,6 @@
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
-#include "player.h"
 #include "prototypes.h"
 #include "queue.h"
 #include "xy.h"

src/lib/subs/mslsub.c

@@ -36,17 +36,13 @@
 
 #include <stdlib.h>
 #include "file.h"
-#include "land.h"
 #include "misc.h"
-#include "mission.h"
 #include "nat.h"
 #include "news.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "optlist.h"
-#include "path.h"
 #include "plane.h"
-#include "player.h"
 #include "prototypes.h"
 #include "queue.h"
 #include "sect.h"

src/lib/subs/nxtitem.c

@@ -37,7 +37,6 @@
 #include "land.h"
 #include "misc.h"
 #include "nsc.h"
-#include "player.h"
 #include "prototypes.h"
 #include "ship.h"
 #include "unit.h"

src/lib/subs/plnsub.c

@@ -38,14 +38,12 @@
 #include "file.h"
 #include "item.h"
 #include "land.h"
-#include "lost.h"
 #include "map.h"
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "optlist.h"
-#include "path.h"
 #include "plane.h"
 #include "player.h"
 #include "prototypes.h"

src/lib/subs/pr.c

@@ -52,7 +52,6 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include "com.h"
 #include "empio.h"
 #include "file.h"
 #include "journal.h"
@@ -62,7 +61,6 @@
 #include "proto.h"
 #include "prototypes.h"
 #include "server.h"
-#include "tel.h"
 #include "xy.h"
 
 static void pr_player(struct player *pl, int id, char *buf);

src/lib/subs/retreat.c

@@ -42,7 +42,6 @@
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
-#include "player.h"
 #include "prototypes.h"
 #include "retreat.h"
 #include "sect.h"

src/lib/subs/sarg.c

@@ -38,7 +38,6 @@
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
-#include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
 #include "xy.h"

src/lib/subs/sect.c

@@ -36,13 +36,10 @@
 
 #include <ctype.h>
 #include "file.h"
-#include "land.h"
 #include "lost.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "optlist.h"
-#include "plane.h"
 #include "player.h"
 #include "prototypes.h"
 #include "sect.h"

src/lib/subs/sectdamage.c

@@ -38,7 +38,6 @@
 #include "file.h"
 #include "land.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "plane.h"

src/lib/subs/supply.c

@@ -39,7 +39,6 @@
 #include "nat.h"
 #include "optlist.h"
 #include "path.h"
-#include "player.h"
 #include "prototypes.h"
 #include "sect.h"
 #include "ship.h"

src/lib/subs/trdsub.c

@@ -43,9 +43,7 @@
 #include "nat.h"
 #include "nsc.h"
 #include "nuke.h"
-#include "optlist.h"
 #include "plane.h"
-#include "player.h"
 #include "prototypes.h"
 #include "sect.h"
 #include "ship.h"

src/lib/update/human.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include <math.h>
-#include "budg.h"
 #include "item.h"
 #include "news.h"
 #include "player.h"

src/lib/update/land.c

@@ -42,7 +42,6 @@
 #include "news.h"
 #include "plague.h"
 #include "player.h"
-#include "ship.h"
 #include "update.h"
 
 static void landrepair(struct lndstr *, struct natstr *, struct bp *, int);

src/lib/update/main.c

@@ -40,7 +40,6 @@
 #include "empthread.h"
 #include "game.h"
 #include "journal.h"
-#include "player.h"
 #include "server.h"
 #include "unit.h"
 #include "update.h"

src/lib/update/move_sat.c

@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "nsc.h"
-#include "path.h"
 #include "plane.h"
 #include "update.h"
 

src/lib/update/nav_util.c

@@ -33,11 +33,8 @@
 #include <config.h>
 
 #include "item.h"
-#include "land.h"
 #include "nsc.h"
-#include "path.h"
 #include "plague.h"
-#include "plane.h"
 #include "ship.h"
 #include "update.h"
 

src/lib/update/populace.c

@@ -32,9 +32,7 @@
 
 #include <config.h>
 
-#include "land.h"
 #include "lost.h"
-#include "path.h"
 #include "update.h"
 
 void

src/lib/update/prepare.c

@@ -37,7 +37,6 @@
 #include "budg.h"
 #include "item.h"
 #include "land.h"
-#include "path.h"
 #include "player.h"
 #include "ship.h"
 #include "update.h"

src/lib/update/sect.c

@@ -40,7 +40,6 @@
 #include "lost.h"
 #include "path.h"
 #include "player.h"
-#include "product.h"
 #include "ship.h"
 #include "update.h"
 

src/server/main.c

@@ -54,11 +54,8 @@
 #include "empthread.h"
 #include "file.h"
 #include "journal.h"
-#include "land.h"
 #include "match.h"
 #include "misc.h"
-#include "nat.h"
-#include "nuke.h"
 #include "optlist.h"
 #include "plane.h"
 #include "player.h"
@@ -66,7 +63,6 @@
 #include "prototypes.h"
 #include "sect.h"
 #include "server.h"
-#include "ship.h"
 #include "version.h"
 
 static void ignore(void);

src/server/marketup.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "empthread.h"
-#include "file.h"
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"

src/server/shutdown.c

@@ -35,7 +35,6 @@
 
 #include <time.h>
 #include "empthread.h"
-#include "file.h"
 #include "nat.h"
 #include "prototypes.h"
 #include "server.h"

src/util/fairland.c

@@ -71,10 +71,7 @@ static int quiet = 0;
 #include <stdio.h>
 #include <unistd.h>
 #include "file.h"
-#include "misc.h"
-#include "nat.h"
 #include "optlist.h"
-#include "power.h"
 #include "prototypes.h"
 #include "sect.h"
 #include "version.h"

src/util/files.c

@@ -39,19 +39,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "file.h"
-#include "game.h"
-#include "land.h"
-#include "misc.h"
 #include "nat.h"
-#include "nuke.h"
 #include "optlist.h"
-#include "plane.h"
-#include "power.h"
 #include "prototypes.h"
-#include "sect.h"
-#include "ship.h"
 #include "tel.h"
-#include "trade.h"
 #include "version.h"
 
 static void