From 786e2a99d5bc8583ebf4d99deb6a96af32261347 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 18 Mar 2012 20:23:18 +0100 Subject: [PATCH] Clean up superfluous includes --- src/lib/commands/acce.c | 1 - src/lib/commands/anti.c | 1 - src/lib/commands/assa.c | 2 -- src/lib/commands/atta.c | 2 -- src/lib/commands/bdes.c | 1 - src/lib/commands/boar.c | 2 -- src/lib/commands/budg.c | 3 --- src/lib/commands/buy.c | 4 ---- src/lib/commands/carg.c | 1 - src/lib/commands/coll.c | 1 - src/lib/commands/desi.c | 1 - src/lib/commands/drop.c | 1 - src/lib/commands/edit.c | 1 - src/lib/commands/fly.c | 1 - src/lib/commands/hard.c | 1 - src/lib/commands/improve.c | 2 -- src/lib/commands/land.c | 1 - src/lib/commands/lboard.c | 2 -- src/lib/commands/ldump.c | 1 - src/lib/commands/leve.c | 1 - src/lib/commands/lten.c | 1 - src/lib/commands/map.c | 3 --- src/lib/commands/marc.c | 3 --- src/lib/commands/miss.c | 2 -- src/lib/commands/move.c | 1 - src/lib/commands/name.c | 2 -- src/lib/commands/para.c | 2 -- src/lib/commands/pdump.c | 1 - src/lib/commands/plan.c | 1 - src/lib/commands/rada.c | 1 - src/lib/commands/rang.c | 1 - src/lib/commands/reco.c | 1 - src/lib/commands/reje.c | 1 - src/lib/commands/rese.c | 3 --- src/lib/commands/reso.c | 1 - src/lib/commands/retr.c | 1 - src/lib/commands/sdump.c | 2 -- src/lib/commands/sell.c | 3 --- src/lib/commands/setsect.c | 1 - src/lib/commands/shi.c | 2 -- src/lib/commands/shoo.c | 1 - src/lib/commands/sstat.c | 1 - src/lib/commands/stop.c | 1 - src/lib/commands/stre.c | 1 - src/lib/commands/strv.c | 1 - src/lib/commands/tend.c | 1 - src/lib/commands/torp.c | 1 - src/lib/commands/tran.c | 2 -- src/lib/common/conftab.c | 1 - src/lib/common/emp_config.c | 1 - src/lib/common/file.c | 1 - src/lib/common/game.c | 1 - src/lib/common/hap_fact.c | 2 -- src/lib/common/res_pop.c | 1 - src/lib/empthread/io.c | 1 - src/lib/gen/log.c | 2 -- src/lib/lwp/arch.c | 1 - src/lib/lwp/queue.c | 1 - src/lib/player/accept.c | 2 -- src/lib/player/dispatch.c | 1 - src/lib/player/empdis.c | 2 -- src/lib/player/init_nats.c | 1 - src/lib/player/player.c | 3 --- src/lib/subs/bridgefall.c | 2 -- src/lib/subs/damage.c | 1 - src/lib/subs/detonate.c | 1 - src/lib/subs/getele.c | 1 - src/lib/subs/mission.c | 1 - src/lib/subs/mslsub.c | 4 ---- src/lib/subs/nxtitem.c | 1 - src/lib/subs/plnsub.c | 2 -- src/lib/subs/pr.c | 2 -- src/lib/subs/retreat.c | 1 - src/lib/subs/sarg.c | 1 - src/lib/subs/sect.c | 3 --- src/lib/subs/sectdamage.c | 1 - src/lib/subs/supply.c | 1 - src/lib/subs/trdsub.c | 2 -- src/lib/update/human.c | 1 - src/lib/update/land.c | 1 - src/lib/update/main.c | 1 - src/lib/update/move_sat.c | 1 - src/lib/update/nav_util.c | 3 --- src/lib/update/populace.c | 2 -- src/lib/update/prepare.c | 1 - src/lib/update/sect.c | 1 - src/server/main.c | 4 ---- src/server/marketup.c | 1 - src/server/shutdown.c | 1 - src/util/fairland.c | 3 --- src/util/files.c | 9 --------- 91 files changed, 146 deletions(-) diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c index 587e8eec..12bbac58 100644 --- a/src/lib/commands/acce.c +++ b/src/lib/commands/acce.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "optlist.h" /* * report rejection status of telegrams and treaties. diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c index f456bee4..0ec14ab2 100644 --- a/src/lib/commands/anti.c +++ b/src/lib/commands/anti.c @@ -35,7 +35,6 @@ #include "commands.h" #include "item.h" -#include "lost.h" #include "optlist.h" /* diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c index 30915ccf..bd90cd44 100644 --- a/src/lib/commands/assa.c +++ b/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" diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c index 8849f6ce..87d19785 100644 --- a/src/lib/commands/atta.c +++ b/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" diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c index d7f689ee..501a4de7 100644 --- a/src/lib/commands/bdes.c +++ b/src/lib/commands/bdes.c @@ -35,7 +35,6 @@ #include #include "commands.h" #include "map.h" -#include "path.h" int bdes(void) diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c index c0dfafec..1e98fba6 100644 --- a/src/lib/commands/boar.c +++ b/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" diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index 15312e10..63fe0c7d 100644 --- a/src/lib/commands/budg.c +++ b/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, diff --git a/src/lib/commands/buy.c b/src/lib/commands/buy.c index 297a9cc4..0302cd0d 100644 --- a/src/lib/commands/buy.c +++ b/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" /* diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c index 4f537c7c..efc647e0 100644 --- a/src/lib/commands/carg.c +++ b/src/lib/commands/carg.c @@ -34,7 +34,6 @@ #include "commands.h" #include "land.h" -#include "optlist.h" #include "ship.h" int diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c index 6313ac7b..364314c7 100644 --- a/src/lib/commands/coll.c +++ b/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" diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c index 386e869b..d1f2a9ea 100644 --- a/src/lib/commands/desi.c +++ b/src/lib/commands/desi.c @@ -36,7 +36,6 @@ #include "commands.h" #include "map.h" #include "optlist.h" -#include "path.h" int desi(void) diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c index b6242dcf..1f1242c5 100644 --- a/src/lib/commands/drop.c +++ b/src/lib/commands/drop.c @@ -37,7 +37,6 @@ #include "item.h" #include "path.h" #include "plane.h" -#include "ship.h" int drop(void) diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index 39ce5671..b4b0688b 100644 --- a/src/lib/commands/edit.c +++ b/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" diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c index aef82611..075fd6fa 100644 --- a/src/lib/commands/fly.c +++ b/src/lib/commands/fly.c @@ -38,7 +38,6 @@ #include "item.h" #include "path.h" #include "plane.h" -#include "ship.h" int fly(void) diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c index cadac1cc..60bbb336 100644 --- a/src/lib/commands/hard.c +++ b/src/lib/commands/hard.c @@ -35,7 +35,6 @@ #include "commands.h" #include "item.h" #include "plane.h" -#include "ship.h" /* * harden diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c index d3c99c19..e292342d 100644 --- a/src/lib/commands/improve.c +++ b/src/lib/commands/improve.c @@ -33,8 +33,6 @@ #include #include "commands.h" -#include "optlist.h" -#include "path.h" int improve(void) diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c index 9230294c..1bed3d94 100644 --- a/src/lib/commands/land.c +++ b/src/lib/commands/land.c @@ -34,7 +34,6 @@ #include "commands.h" #include "land.h" -#include "optlist.h" int land(void) diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c index 826590c3..f250444a 100644 --- a/src/lib/commands/lboard.c +++ b/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 diff --git a/src/lib/commands/ldump.c b/src/lib/commands/ldump.c index d63330f1..96e5ffd4 100644 --- a/src/lib/commands/ldump.c +++ b/src/lib/commands/ldump.c @@ -35,7 +35,6 @@ #include "commands.h" #include "land.h" -#include "optlist.h" int ldump(void) diff --git a/src/lib/commands/leve.c b/src/lib/commands/leve.c index 3bd962c3..7fd3cf49 100644 --- a/src/lib/commands/leve.c +++ b/src/lib/commands/leve.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "path.h" int leve(void) diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c index bb062e16..68712a46 100644 --- a/src/lib/commands/lten.c +++ b/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); diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c index cc8a46e4..767a1a42 100644 --- a/src/lib/commands/map.c +++ b/src/lib/commands/map.c @@ -36,10 +36,7 @@ #include #include "commands.h" -#include "land.h" #include "map.h" -#include "optlist.h" -#include "ship.h" int map(void) diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c index a1a8980a..e71815de 100644 --- a/src/lib/commands/marc.c +++ b/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) diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index 93f96bb6..15fdc632 100644 --- a/src/lib/commands/miss.c +++ b/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 *); diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c index 8668a735..2bcebe42 100644 --- a/src/lib/commands/move.c +++ b/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" diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c index 6cceb65e..fa5d5f08 100644 --- a/src/lib/commands/name.c +++ b/src/lib/commands/name.c @@ -33,8 +33,6 @@ #include #include "commands.h" -#include "optlist.h" -#include "path.h" #include "ship.h" /* diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c index 3a424fb5..a6ea5c23 100644 --- a/src/lib/commands/para.c +++ b/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" diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c index 55a3fe13..869949c7 100644 --- a/src/lib/commands/pdump.c +++ b/src/lib/commands/pdump.c @@ -35,7 +35,6 @@ #include "commands.h" #include "nuke.h" -#include "optlist.h" #include "plane.h" int diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c index f702ed9b..4cdc00c4 100644 --- a/src/lib/commands/plan.c +++ b/src/lib/commands/plan.c @@ -36,7 +36,6 @@ #include "commands.h" #include "nuke.h" -#include "optlist.h" #include "plane.h" int diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c index 809b7f8c..a0b28e99 100644 --- a/src/lib/commands/rada.c +++ b/src/lib/commands/rada.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "optlist.h" #include "unit.h" int diff --git a/src/lib/commands/rang.c b/src/lib/commands/rang.c index b54c6ccb..d806b628 100644 --- a/src/lib/commands/rang.c +++ b/src/lib/commands/rang.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "land.h" #include "plane.h" int diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c index 1a5f74f4..0eb83fa6 100644 --- a/src/lib/commands/reco.c +++ b/src/lib/commands/reco.c @@ -36,7 +36,6 @@ #include "commands.h" #include "path.h" #include "plane.h" -#include "ship.h" int reco(void) diff --git a/src/lib/commands/reje.c b/src/lib/commands/reje.c index eafb9c2f..cd53a839 100644 --- a/src/lib/commands/reje.c +++ b/src/lib/commands/reje.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "optlist.h" int reje(void) diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c index 43f9451a..6919bf3e 100644 --- a/src/lib/commands/rese.c +++ b/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) diff --git a/src/lib/commands/reso.c b/src/lib/commands/reso.c index 851bb4b4..ef35eb9a 100644 --- a/src/lib/commands/reso.c +++ b/src/lib/commands/reso.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "path.h" static void reso_hdr(void); diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c index 1a093062..758dba9b 100644 --- a/src/lib/commands/retr.c +++ b/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" diff --git a/src/lib/commands/sdump.c b/src/lib/commands/sdump.c index 3d197506..06f86c24 100644 --- a/src/lib/commands/sdump.c +++ b/src/lib/commands/sdump.c @@ -34,8 +34,6 @@ #include #include "commands.h" -#include "land.h" -#include "optlist.h" #include "ship.h" int diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c index cf838335..8e5971be 100644 --- a/src/lib/commands/sell.c +++ b/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 diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c index 05397967..b522f29e 100644 --- a/src/lib/commands/setsect.c +++ b/src/lib/commands/setsect.c @@ -34,7 +34,6 @@ #include #include "commands.h" -#include "lost.h" #include "news.h" #include "optlist.h" diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c index 9d6fd6fc..74b6169c 100644 --- a/src/lib/commands/shi.c +++ b/src/lib/commands/shi.c @@ -33,8 +33,6 @@ #include #include "commands.h" -#include "land.h" -#include "optlist.h" #include "ship.h" int diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c index a7d61d03..51e6ab9c 100644 --- a/src/lib/commands/shoo.c +++ b/src/lib/commands/shoo.c @@ -36,7 +36,6 @@ #include "item.h" #include "land.h" #include "news.h" -#include "path.h" int shoo(void) diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c index f2350796..d7a7e50c 100644 --- a/src/lib/commands/sstat.c +++ b/src/lib/commands/sstat.c @@ -33,7 +33,6 @@ #include #include "commands.h" -#include "land.h" #include "ship.h" int diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c index 330d22f3..32bdd314 100644 --- a/src/lib/commands/stop.c +++ b/src/lib/commands/stop.c @@ -37,7 +37,6 @@ #include #include "commands.h" #include "empobj.h" -#include "path.h" static int start_stop(int); static int start_stop_sector(char *, int); diff --git a/src/lib/commands/stre.c b/src/lib/commands/stre.c index 55e08636..c7fb579b 100644 --- a/src/lib/commands/stre.c +++ b/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); diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c index 7e7ce53c..5bb4b66a 100644 --- a/src/lib/commands/strv.c +++ b/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); diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c index 0de9659e..7ec6e8e6 100644 --- a/src/lib/commands/tend.c +++ b/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); diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c index df5eedec..daa4cb74 100644 --- a/src/lib/commands/torp.c +++ b/src/lib/commands/torp.c @@ -38,7 +38,6 @@ #include "commands.h" #include "news.h" -#include "optlist.h" #include "retreat.h" #include "ship.h" diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c index 47e1b2c6..40e4052d 100644 --- a/src/lib/commands/tran.c +++ b/src/lib/commands/tran.c @@ -34,11 +34,9 @@ #include #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 *); diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c index 6e57b76b..47fb4d62 100644 --- a/src/lib/common/conftab.c +++ b/src/lib/common/conftab.c @@ -36,7 +36,6 @@ #include #include "file.h" #include "optlist.h" -#include "product.h" #include "prototypes.h" #include "xdump.h" diff --git a/src/lib/common/emp_config.c b/src/lib/common/emp_config.c index 89cead07..216dfaca 100644 --- a/src/lib/common/emp_config.c +++ b/src/lib/common/emp_config.c @@ -50,7 +50,6 @@ #include #include -#include "file.h" #include "misc.h" #include "optlist.h" #include "prototypes.h" diff --git a/src/lib/common/file.c b/src/lib/common/file.c index 675e776f..7d081e21 100644 --- a/src/lib/common/file.c +++ b/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); diff --git a/src/lib/common/game.c b/src/lib/common/game.c index 049c6567..12599059 100644 --- a/src/lib/common/game.c +++ b/src/lib/common/game.c @@ -46,7 +46,6 @@ #include "file.h" #include "game.h" #include "optlist.h" -#include "prototypes.h" #include "server.h" /* diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c index 4c5ef541..7f4b0dff 100644 --- a/src/lib/common/hap_fact.c +++ b/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" diff --git a/src/lib/common/res_pop.c b/src/lib/common/res_pop.c index c33751d7..ff6d1eea 100644 --- a/src/lib/common/res_pop.c +++ b/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" diff --git a/src/lib/empthread/io.c b/src/lib/empthread/io.c index 6578c295..3c5c0602 100644 --- a/src/lib/empthread/io.c +++ b/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; diff --git a/src/lib/gen/log.c b/src/lib/gen/log.c index dd4cef9a..b32a9965 100644 --- a/src/lib/gen/log.c +++ b/src/lib/gen/log.c @@ -41,8 +41,6 @@ #include #include #include "misc.h" -#include "optlist.h" -#include "player.h" #include "prototypes.h" void (*oops_handler)(void) = abort; diff --git a/src/lib/lwp/arch.c b/src/lib/lwp/arch.c index 653f33a0..c3e726ae 100644 --- a/src/lib/lwp/arch.c +++ b/src/lib/lwp/arch.c @@ -36,7 +36,6 @@ #include #include -#include "lwp.h" #include "lwpint.h" /* diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c index 3de3b882..aa90d144 100644 --- a/src/lib/lwp/queue.c +++ b/src/lib/lwp/queue.c @@ -34,7 +34,6 @@ #include #include -#include "lwp.h" #include "lwpint.h" struct lwpProc * diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index 92b5456e..9f6ecd49 100644 --- a/src/lib/player/accept.c +++ b/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; diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c index 03b87f79..73f5051c 100644 --- a/src/lib/player/dispatch.c +++ b/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" diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index f3c5ef5c..c986847f 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -38,7 +38,6 @@ #include #include #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" diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index dee407cc..f5d60593 100644 --- a/src/lib/player/init_nats.c +++ b/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) diff --git a/src/lib/player/player.c b/src/lib/player/player.c index b2f2c462..98e642ed 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -34,7 +34,6 @@ #include -#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); diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c index 27ff3fef..4818eb57 100644 --- a/src/lib/subs/bridgefall.c +++ b/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" diff --git a/src/lib/subs/damage.c b/src/lib/subs/damage.c index 9c2fcc28..f5e5b2d6 100644 --- a/src/lib/subs/damage.c +++ b/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 diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c index bec06302..01dc5d4c 100644 --- a/src/lib/subs/detonate.c +++ b/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" diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c index 7426b604..afbc4b2b 100644 --- a/src/lib/subs/getele.c +++ b/src/lib/subs/getele.c @@ -34,7 +34,6 @@ #include -#include "player.h" #include "prototypes.h" #include "tel.h" diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index 296022a6..76e350ec 100644 --- a/src/lib/subs/mission.c +++ b/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" diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index 2a3dff0f..a3557b84 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -36,17 +36,13 @@ #include #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" diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c index 6b646f75..0480f563 100644 --- a/src/lib/subs/nxtitem.c +++ b/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" diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index ee2fb655..cdc0c482 100644 --- a/src/lib/subs/plnsub.c +++ b/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" diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index 6413a5e6..780283c6 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -52,7 +52,6 @@ #include #include -#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); diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 04703560..b1d796c3 100644 --- a/src/lib/subs/retreat.c +++ b/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" diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c index d2d44ada..3b3e326e 100644 --- a/src/lib/subs/sarg.c +++ b/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" diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c index 769f312f..9ac18dff 100644 --- a/src/lib/subs/sect.c +++ b/src/lib/subs/sect.c @@ -36,13 +36,10 @@ #include #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" diff --git a/src/lib/subs/sectdamage.c b/src/lib/subs/sectdamage.c index 0299e54b..587a3914 100644 --- a/src/lib/subs/sectdamage.c +++ b/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" diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c index 66de3526..d723c6af 100644 --- a/src/lib/subs/supply.c +++ b/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" diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c index d42ac401..f8515122 100644 --- a/src/lib/subs/trdsub.c +++ b/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" diff --git a/src/lib/update/human.c b/src/lib/update/human.c index d972b651..388026b2 100644 --- a/src/lib/update/human.c +++ b/src/lib/update/human.c @@ -35,7 +35,6 @@ #include #include -#include "budg.h" #include "item.h" #include "news.h" #include "player.h" diff --git a/src/lib/update/land.c b/src/lib/update/land.c index 09c975d5..1bc1ff6c 100644 --- a/src/lib/update/land.c +++ b/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); diff --git a/src/lib/update/main.c b/src/lib/update/main.c index cc4d6e15..d87107a4 100644 --- a/src/lib/update/main.c +++ b/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" diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c index 7396a36f..a692d840 100644 --- a/src/lib/update/move_sat.c +++ b/src/lib/update/move_sat.c @@ -34,7 +34,6 @@ #include #include "nsc.h" -#include "path.h" #include "plane.h" #include "update.h" diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c index 2b3beafb..070b8c05 100644 --- a/src/lib/update/nav_util.c +++ b/src/lib/update/nav_util.c @@ -33,11 +33,8 @@ #include #include "item.h" -#include "land.h" #include "nsc.h" -#include "path.h" #include "plague.h" -#include "plane.h" #include "ship.h" #include "update.h" diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c index ae14ae5d..4345229d 100644 --- a/src/lib/update/populace.c +++ b/src/lib/update/populace.c @@ -32,9 +32,7 @@ #include -#include "land.h" #include "lost.h" -#include "path.h" #include "update.h" void diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c index cacc4e14..e64c67ba 100644 --- a/src/lib/update/prepare.c +++ b/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" diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index 57046a1d..116d7946 100644 --- a/src/lib/update/sect.c +++ b/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" diff --git a/src/server/main.c b/src/server/main.c index da02ccdf..44dbd626 100644 --- a/src/server/main.c +++ b/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); diff --git a/src/server/marketup.c b/src/server/marketup.c index ae42a096..d02aac7d 100644 --- a/src/server/marketup.c +++ b/src/server/marketup.c @@ -34,7 +34,6 @@ #include #include "empthread.h" -#include "file.h" #include "optlist.h" #include "player.h" #include "prototypes.h" diff --git a/src/server/shutdown.c b/src/server/shutdown.c index 3e4b319b..389d6d8a 100644 --- a/src/server/shutdown.c +++ b/src/server/shutdown.c @@ -35,7 +35,6 @@ #include #include "empthread.h" -#include "file.h" #include "nat.h" #include "prototypes.h" #include "server.h" diff --git a/src/util/fairland.c b/src/util/fairland.c index 37bd940f..618cf7b2 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -71,10 +71,7 @@ static int quiet = 0; #include #include #include "file.h" -#include "misc.h" -#include "nat.h" #include "optlist.h" -#include "power.h" #include "prototypes.h" #include "sect.h" #include "version.h" diff --git a/src/util/files.c b/src/util/files.c index 986ab6f6..3557efc7 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -39,19 +39,10 @@ #include #include #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