From 549561ff0332a8e8b2ee4ae2d92e44aa53a2d982 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 16 Jul 2016 10:09:42 +0200 Subject: [PATCH] Include "file.h" where it's needed Several headers define macros that use ef_ptr() without including "file.h". Fix that. Drop redundant inclusions elsewhere. Signed-off-by: Markus Armbruster --- include/commands.h | 1 - include/commodity.h | 2 +- include/game.h | 2 +- include/land.h | 2 +- include/loan.h | 2 +- include/lost.h | 2 +- include/nat.h | 2 +- include/news.h | 2 +- include/nuke.h | 2 +- include/plane.h | 2 +- include/power.h | 1 + include/sect.h | 2 +- include/ship.h | 2 +- include/trade.h | 2 +- src/lib/common/btu.c | 1 - src/lib/common/cargo.c | 1 - src/lib/common/cnumb.c | 1 - src/lib/common/ef_verify.c | 1 - src/lib/common/empobj.c | 1 - src/lib/common/filetable.c | 1 - src/lib/common/game.c | 1 - src/lib/common/move.c | 1 - src/lib/common/nat.c | 1 - src/lib/common/nsc.c | 1 - src/lib/common/nstreval.c | 1 - src/lib/common/pathfind.c | 1 - src/lib/common/tfact.c | 1 - src/lib/common/type.c | 1 - src/lib/common/wantupd.c | 1 - src/lib/common/xdump.c | 1 - src/lib/common/xundump.c | 1 - src/lib/common/xy.c | 1 - src/lib/player/dispatch.c | 1 - src/lib/player/empdis.c | 1 - src/lib/player/init_nats.c | 1 - src/lib/player/login.c | 1 - src/lib/player/nat.c | 1 - src/lib/player/player.c | 1 - src/lib/subs/actofgod.c | 1 - src/lib/subs/aircombat.c | 1 - src/lib/subs/aswplnsubs.c | 1 - src/lib/subs/attsub.c | 1 - src/lib/subs/bridgefall.c | 1 - src/lib/subs/bsanct.c | 1 - src/lib/subs/caploss.c | 1 - src/lib/subs/check.c | 1 - src/lib/subs/coastal.c | 1 - src/lib/subs/control.c | 1 - src/lib/subs/detonate.c | 1 - src/lib/subs/disloan.c | 1 - src/lib/subs/fileinit.c | 1 - src/lib/subs/fortdef.c | 1 - src/lib/subs/land.c | 1 - src/lib/subs/landgun.c | 1 - src/lib/subs/list.c | 1 - src/lib/subs/lndsub.c | 1 - src/lib/subs/lostsub.c | 1 - src/lib/subs/maps.c | 1 - src/lib/subs/mission.c | 1 - src/lib/subs/move.c | 1 - src/lib/subs/mslsub.c | 1 - src/lib/subs/natarg.c | 1 - src/lib/subs/natsub.c | 1 - src/lib/subs/neigh.c | 1 - src/lib/subs/nreport.c | 1 - src/lib/subs/nuke.c | 1 - src/lib/subs/nxtitem.c | 1 - src/lib/subs/paths.c | 1 - src/lib/subs/plane.c | 1 - src/lib/subs/plnsub.c | 1 - src/lib/subs/pr.c | 1 - src/lib/subs/radmap.c | 1 - src/lib/subs/rej.c | 1 - src/lib/subs/retreat.c | 1 - src/lib/subs/sarg.c | 1 - src/lib/subs/satmap.c | 1 - src/lib/subs/sect.c | 1 - src/lib/subs/sectdamage.c | 1 - src/lib/subs/ship.c | 1 - src/lib/subs/show.c | 1 - src/lib/subs/shpsub.c | 1 - src/lib/subs/snxtitem.c | 1 - src/lib/subs/snxtsct.c | 1 - src/lib/subs/supply.c | 1 - src/lib/subs/takeover.c | 1 - src/lib/subs/trdsub.c | 1 - src/lib/subs/unitsub.c | 1 - src/lib/subs/wu.c | 1 - src/lib/update/age.c | 1 - src/lib/update/deliver.c | 1 - src/lib/update/distribute.c | 1 - src/lib/update/finish.c | 1 - src/lib/update/land.c | 1 - src/lib/update/main.c | 1 - src/lib/update/mobility.c | 1 - src/lib/update/move_sat.c | 1 - src/lib/update/nat.c | 1 - src/lib/update/nxtitemp.c | 1 - src/lib/update/plague.c | 1 - src/lib/update/plane.c | 1 - src/lib/update/populace.c | 1 - src/lib/update/prepare.c | 1 - src/lib/update/removewants.c | 1 - src/lib/update/revolt.c | 1 - src/lib/update/sect.c | 1 - src/lib/update/ship.c | 1 - src/server/update.c | 1 - src/util/empdump.c | 1 - src/util/fairland.c | 1 - src/util/files.c | 1 - 110 files changed, 13 insertions(+), 109 deletions(-) diff --git a/include/commands.h b/include/commands.h index c7c6a53e..ebd128b4 100644 --- a/include/commands.h +++ b/include/commands.h @@ -33,7 +33,6 @@ #ifndef COMMANDS_H #define COMMANDS_H -#include "file.h" #include "nat.h" #include "nsc.h" #include "player.h" diff --git a/include/commodity.h b/include/commodity.h index 08b23f42..8dd349cb 100644 --- a/include/commodity.h +++ b/include/commodity.h @@ -35,7 +35,7 @@ #ifndef COMMODITY_H #define COMMODITY_H -#include +#include "file.h" #include "types.h" #include "item.h" diff --git a/include/game.h b/include/game.h index df135acc..7cc508d6 100644 --- a/include/game.h +++ b/include/game.h @@ -33,7 +33,7 @@ #ifndef GAME_H #define GAME_H -#include +#include "file.h" struct gamestr { /* initial part must match struct empobj */ diff --git a/include/land.h b/include/land.h index 42d98147..8282ba58 100644 --- a/include/land.h +++ b/include/land.h @@ -36,7 +36,7 @@ #ifndef LAND_H #define LAND_H -#include +#include "file.h" #include "item.h" #include "retreat.h" #include "types.h" diff --git a/include/loan.h b/include/loan.h index e9892cbf..d09f428d 100644 --- a/include/loan.h +++ b/include/loan.h @@ -33,7 +33,7 @@ #ifndef LOAN_H #define LOAN_H -#include +#include "file.h" #include "types.h" #define MAXLOAN 100000 diff --git a/include/lost.h b/include/lost.h index 6ded15d0..7a7d2afb 100644 --- a/include/lost.h +++ b/include/lost.h @@ -33,7 +33,7 @@ #ifndef LOST_H #define LOST_H -#include +#include "file.h" #include "types.h" struct loststr { diff --git a/include/nat.h b/include/nat.h index 5a1318b8..20f7ba88 100644 --- a/include/nat.h +++ b/include/nat.h @@ -37,7 +37,7 @@ #ifndef NAT_H #define NAT_H -#include +#include "file.h" #include "types.h" #define NATID_BAD 255 diff --git a/include/news.h b/include/news.h index 469963f8..46c76e9a 100644 --- a/include/news.h +++ b/include/news.h @@ -40,7 +40,7 @@ #ifndef NEWS_H #define NEWS_H -#include +#include "file.h" #include "nsc.h" struct nwsstr { diff --git a/include/nuke.h b/include/nuke.h index 2ef7bf01..22cd226c 100644 --- a/include/nuke.h +++ b/include/nuke.h @@ -34,7 +34,7 @@ #ifndef NUKE_H #define NUKE_H -#include +#include "file.h" #include "item.h" #include "types.h" diff --git a/include/plane.h b/include/plane.h index a434b78d..c95cedc0 100644 --- a/include/plane.h +++ b/include/plane.h @@ -36,7 +36,7 @@ #ifndef PLANE_H #define PLANE_H -#include +#include "file.h" #include "item.h" #include "queue.h" #include "types.h" diff --git a/include/power.h b/include/power.h index 1e9ea2cc..8e7ce249 100644 --- a/include/power.h +++ b/include/power.h @@ -33,6 +33,7 @@ #ifndef POWER_H #define POWER_H +#include "file.h" #include "types.h" struct powstr { diff --git a/include/sect.h b/include/sect.h index 8bbb65f1..06c79958 100644 --- a/include/sect.h +++ b/include/sect.h @@ -37,7 +37,7 @@ #ifndef SECT_H #define SECT_H -#include +#include "file.h" #include "item.h" #include "types.h" diff --git a/include/ship.h b/include/ship.h index 3e9d1f1f..aefd50dd 100644 --- a/include/ship.h +++ b/include/ship.h @@ -37,7 +37,7 @@ #ifndef SHIP_H #define SHIP_H -#include +#include "file.h" #include "item.h" #include "retreat.h" #include "types.h" diff --git a/include/trade.h b/include/trade.h index cd36d7ea..4529f7fa 100644 --- a/include/trade.h +++ b/include/trade.h @@ -36,7 +36,7 @@ #ifndef TRADE_H #define TRADE_H -#include +#include "file.h" #include "types.h" struct trdstr { diff --git a/src/lib/common/btu.c b/src/lib/common/btu.c index 7322ac41..830d131f 100644 --- a/src/lib/common/btu.c +++ b/src/lib/common/btu.c @@ -33,7 +33,6 @@ #include #include "chance.h" -#include "file.h" #include "nat.h" #include "optlist.h" #include "sect.h" diff --git a/src/lib/common/cargo.c b/src/lib/common/cargo.c index 3b8422a0..c2bc9250 100644 --- a/src/lib/common/cargo.c +++ b/src/lib/common/cargo.c @@ -35,7 +35,6 @@ #include #include #include -#include "file.h" #include "unit.h" struct clink { diff --git a/src/lib/common/cnumb.c b/src/lib/common/cnumb.c index a01af45a..5e64bc17 100644 --- a/src/lib/common/cnumb.c +++ b/src/lib/common/cnumb.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "match.h" #include "nat.h" #include "prototypes.h" diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c index b5c31eac..c96d7b0f 100644 --- a/src/lib/common/ef_verify.c +++ b/src/lib/common/ef_verify.c @@ -37,7 +37,6 @@ #include #include #include "empobj.h" -#include "file.h" #include "misc.h" #include "nsc.h" #include "product.h" diff --git a/src/lib/common/empobj.c b/src/lib/common/empobj.c index a62b7ff1..353b7803 100644 --- a/src/lib/common/empobj.c +++ b/src/lib/common/empobj.c @@ -35,7 +35,6 @@ #include #include "empobj.h" -#include "file.h" #include "news.h" #include "optlist.h" #include "product.h" diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c index 52226da7..ecbf69bf 100644 --- a/src/lib/common/filetable.c +++ b/src/lib/common/filetable.c @@ -35,7 +35,6 @@ #include #include #include "commodity.h" -#include "file.h" #include "game.h" #include "land.h" #include "loan.h" diff --git a/src/lib/common/game.c b/src/lib/common/game.c index 26f795e7..c7b4bcd4 100644 --- a/src/lib/common/game.c +++ b/src/lib/common/game.c @@ -43,7 +43,6 @@ #include #include -#include "file.h" #include "game.h" #include "optlist.h" #include "server.h" diff --git a/src/lib/common/move.c b/src/lib/common/move.c index 8bad4688..e314b5f2 100644 --- a/src/lib/common/move.c +++ b/src/lib/common/move.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "misc.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c index 85b1feb2..2a42a38f 100644 --- a/src/lib/common/nat.c +++ b/src/lib/common/nat.c @@ -35,7 +35,6 @@ #include #include -#include "file.h" #include "misc.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c index 1b0dd78e..107e2d4f 100644 --- a/src/lib/common/nsc.c +++ b/src/lib/common/nsc.c @@ -39,7 +39,6 @@ #include #include "empobj.h" -#include "file.h" #include "optlist.h" #include "news.h" #include "nsc.h" diff --git a/src/lib/common/nstreval.c b/src/lib/common/nstreval.c index 7b99302d..0cc5b49b 100644 --- a/src/lib/common/nstreval.c +++ b/src/lib/common/nstreval.c @@ -37,7 +37,6 @@ #include #include #include -#include "file.h" #include "nat.h" #include "nsc.h" #include "optlist.h" diff --git a/src/lib/common/pathfind.c b/src/lib/common/pathfind.c index bde7d31b..41664ac8 100644 --- a/src/lib/common/pathfind.c +++ b/src/lib/common/pathfind.c @@ -36,7 +36,6 @@ #include #include #include -#include "file.h" #include "nat.h" #include "optlist.h" #include "path.h" diff --git a/src/lib/common/tfact.c b/src/lib/common/tfact.c index 1b43da09..467fa84a 100644 --- a/src/lib/common/tfact.c +++ b/src/lib/common/tfact.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "nat.h" double diff --git a/src/lib/common/type.c b/src/lib/common/type.c index 608dab04..231e2163 100644 --- a/src/lib/common/type.c +++ b/src/lib/common/type.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "item.h" #include "land.h" #include "match.h" diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c index a2439ca6..298114ab 100644 --- a/src/lib/common/wantupd.c +++ b/src/lib/common/wantupd.c @@ -33,7 +33,6 @@ #include #include -#include "file.h" #include "game.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/common/xdump.c b/src/lib/common/xdump.c index 219e33a0..96726343 100644 --- a/src/lib/common/xdump.c +++ b/src/lib/common/xdump.c @@ -75,7 +75,6 @@ #include #include -#include "file.h" #include "nat.h" #include "xdump.h" diff --git a/src/lib/common/xundump.c b/src/lib/common/xundump.c index 0021e3b2..590fdfe9 100644 --- a/src/lib/common/xundump.c +++ b/src/lib/common/xundump.c @@ -58,7 +58,6 @@ #include #include #include -#include "file.h" #include "match.h" #include "nat.h" #include "nsc.h" diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c index 6c69ec42..21b035b7 100644 --- a/src/lib/common/xy.c +++ b/src/lib/common/xy.c @@ -36,7 +36,6 @@ #include #include #include -#include "file.h" #include "misc.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c index cb0e72aa..e14cba4a 100644 --- a/src/lib/player/dispatch.c +++ b/src/lib/player/dispatch.c @@ -37,7 +37,6 @@ #include "chance.h" #include "com.h" #include "empio.h" -#include "file.h" #include "journal.h" #include "match.h" #include "misc.h" diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index 94d422b2..9f519366 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -38,7 +38,6 @@ #include #include #include "com.h" -#include "file.h" #include "game.h" #include "match.h" #include "misc.h" diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index b30c1f9d..fffe3b67 100644 --- a/src/lib/player/init_nats.c +++ b/src/lib/player/init_nats.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "game.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/player/login.c b/src/lib/player/login.c index 32615fef..22984dca 100644 --- a/src/lib/player/login.c +++ b/src/lib/player/login.c @@ -38,7 +38,6 @@ #include "com.h" #include "empio.h" #include "empthread.h" -#include "file.h" #include "journal.h" #include "match.h" #include "misc.h" diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c index 38dc81b2..b3e0d3fe 100644 --- a/src/lib/player/nat.c +++ b/src/lib/player/nat.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "nat.h" #include "prototypes.h" diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 6108b264..660c8773 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -37,7 +37,6 @@ #include "chance.h" #include "empio.h" #include "empthread.h" -#include "file.h" #include "misc.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/subs/actofgod.c b/src/lib/subs/actofgod.c index b2b3b274..20a650e5 100644 --- a/src/lib/subs/actofgod.c +++ b/src/lib/subs/actofgod.c @@ -34,7 +34,6 @@ #include #include "actofgod.h" -#include "file.h" #include "news.h" #include "optlist.h" #include "player.h" diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 7198711c..09f76c3c 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -36,7 +36,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "map.h" #include "misc.h" diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c index c8e7ba0b..937b71af 100644 --- a/src/lib/subs/aswplnsubs.c +++ b/src/lib/subs/aswplnsubs.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "misc.h" #include "nat.h" #include "plane.h" diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index 10dd576e..14a3e616 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -39,7 +39,6 @@ #include "chance.h" #include "combat.h" #include "empobj.h" -#include "file.h" #include "map.h" #include "misc.h" #include "mission.h" diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c index 782c7414..dc66924d 100644 --- a/src/lib/subs/bridgefall.c +++ b/src/lib/subs/bridgefall.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "land.h" #include "misc.h" #include "nsc.h" diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c index 4f9f6b25..242bee42 100644 --- a/src/lib/subs/bsanct.c +++ b/src/lib/subs/bsanct.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "game.h" #include "news.h" #include "player.h" diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c index 0e006846..3766401f 100644 --- a/src/lib/subs/caploss.c +++ b/src/lib/subs/caploss.c @@ -34,7 +34,6 @@ #include #include "commodity.h" -#include "file.h" #include "loan.h" #include "nat.h" #include "news.h" diff --git a/src/lib/subs/check.c b/src/lib/subs/check.c index f47ab17a..917c492b 100644 --- a/src/lib/subs/check.c +++ b/src/lib/subs/check.c @@ -36,7 +36,6 @@ #include #include "commodity.h" #include "empobj.h" -#include "file.h" #include "player.h" #include "prototypes.h" #include "xy.h" diff --git a/src/lib/subs/coastal.c b/src/lib/subs/coastal.c index 8ec42fe3..d8f697b5 100644 --- a/src/lib/subs/coastal.c +++ b/src/lib/subs/coastal.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "path.h" #include "prototypes.h" #include "sect.h" diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c index d0ad3022..a2076a4f 100644 --- a/src/lib/subs/control.c +++ b/src/lib/subs/control.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "land.h" #include "nsc.h" #include "player.h" diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c index 70b39085..6df471f5 100644 --- a/src/lib/subs/detonate.c +++ b/src/lib/subs/detonate.c @@ -34,7 +34,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "map.h" #include "misc.h" diff --git a/src/lib/subs/disloan.c b/src/lib/subs/disloan.c index 12ae4fc3..9ab7a5aa 100644 --- a/src/lib/subs/disloan.c +++ b/src/lib/subs/disloan.c @@ -42,7 +42,6 @@ #include -#include "file.h" #include "loan.h" #include "nat.h" #include "player.h" diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c index 029e6472..8b5c9bee 100644 --- a/src/lib/subs/fileinit.c +++ b/src/lib/subs/fileinit.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "nsc.h" #include "prototypes.h" #include "unit.h" diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c index 764a478b..df26903d 100644 --- a/src/lib/subs/fortdef.c +++ b/src/lib/subs/fortdef.c @@ -38,7 +38,6 @@ #include -#include "file.h" #include "nat.h" #include "news.h" #include "optlist.h" diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c index f9805583..50e6eb96 100644 --- a/src/lib/subs/land.c +++ b/src/lib/subs/land.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "land.h" #include "lost.h" #include "misc.h" diff --git a/src/lib/subs/landgun.c b/src/lib/subs/landgun.c index 8e0c3f15..613cd61e 100644 --- a/src/lib/subs/landgun.c +++ b/src/lib/subs/landgun.c @@ -34,7 +34,6 @@ #include "chance.h" #include "damage.h" -#include "file.h" #include "land.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c index bfb2cc54..4534dfd4 100644 --- a/src/lib/subs/list.c +++ b/src/lib/subs/list.c @@ -35,7 +35,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index bd0f0f01..6cbf1b7a 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -40,7 +40,6 @@ #include "combat.h" #include "damage.h" #include "empobj.h" -#include "file.h" #include "misc.h" #include "mission.h" #include "news.h" diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c index b2505438..31b44331 100644 --- a/src/lib/subs/lostsub.c +++ b/src/lib/subs/lostsub.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "lost.h" #include "misc.h" #include "optlist.h" diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c index a1c3f575..e6446a86 100644 --- a/src/lib/subs/maps.c +++ b/src/lib/subs/maps.c @@ -38,7 +38,6 @@ #include #include "com.h" #include "empobj.h" -#include "file.h" #include "land.h" #include "map.h" #include "match.h" diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index ee909b7c..fc4f6008 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -37,7 +37,6 @@ #include #include "chance.h" #include "empobj.h" -#include "file.h" #include "item.h" #include "misc.h" #include "mission.h" diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c index 8cf877da..adacd850 100644 --- a/src/lib/subs/move.c +++ b/src/lib/subs/move.c @@ -35,7 +35,6 @@ #include #include "chance.h" #include "damage.h" -#include "file.h" #include "map.h" #include "nsc.h" #include "path.h" diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index 8ca0483c..679933a2 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -36,7 +36,6 @@ #include #include "chance.h" -#include "file.h" #include "misc.h" #include "nat.h" #include "news.h" diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c index 41b1ec13..c53dff7d 100644 --- a/src/lib/subs/natarg.c +++ b/src/lib/subs/natarg.c @@ -34,7 +34,6 @@ #include #include -#include "file.h" #include "match.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/subs/natsub.c b/src/lib/subs/natsub.c index 9c265218..071a4a06 100644 --- a/src/lib/subs/natsub.c +++ b/src/lib/subs/natsub.c @@ -34,7 +34,6 @@ #include #include -#include "file.h" #include "nat.h" #include "prototypes.h" diff --git a/src/lib/subs/neigh.c b/src/lib/subs/neigh.c index f23bc0c0..08201417 100644 --- a/src/lib/subs/neigh.c +++ b/src/lib/subs/neigh.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "path.h" #include "prototypes.h" #include "sect.h" diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c index 80bde552..310ae705 100644 --- a/src/lib/subs/nreport.c +++ b/src/lib/subs/nreport.c @@ -36,7 +36,6 @@ #include #include "chance.h" -#include "file.h" #include "nat.h" #include "news.h" #include "optlist.h" diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c index 06a9aef9..d1f2fa70 100644 --- a/src/lib/subs/nuke.c +++ b/src/lib/subs/nuke.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "lost.h" #include "misc.h" #include "nuke.h" diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c index 59cd5ed2..ccf3c9ed 100644 --- a/src/lib/subs/nxtitem.c +++ b/src/lib/subs/nxtitem.c @@ -33,7 +33,6 @@ #include #include "empobj.h" -#include "file.h" #include "land.h" #include "misc.h" #include "nsc.h" diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c index 6b17948e..8355ab31 100644 --- a/src/lib/subs/paths.c +++ b/src/lib/subs/paths.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "optlist.h" #include "path.h" #include "player.h" diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c index 517c9b5b..203d04d8 100644 --- a/src/lib/subs/plane.c +++ b/src/lib/subs/plane.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "lost.h" #include "misc.h" #include "optlist.h" diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index ea87d2a3..324f4ea0 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -37,7 +37,6 @@ #include "chance.h" #include "empobj.h" -#include "file.h" #include "item.h" #include "land.h" #include "map.h" diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index ab7922d8..2eb890af 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -53,7 +53,6 @@ #include #include #include "empio.h" -#include "file.h" #include "journal.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c index 1880a1d4..f48ccac9 100644 --- a/src/lib/subs/radmap.c +++ b/src/lib/subs/radmap.c @@ -34,7 +34,6 @@ #include #include -#include "file.h" #include "map.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index 1ac45846..f9060560 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "nat.h" #include "news.h" #include "optlist.h" diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 8d2f6182..9c6740c3 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "nsc.h" #include "path.h" #include "player.h" diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c index a982538d..6a410239 100644 --- a/src/lib/subs/sarg.c +++ b/src/lib/subs/sarg.c @@ -34,7 +34,6 @@ #include #include -#include "file.h" #include "misc.h" #include "nat.h" #include "nsc.h" diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c index 462c226e..76006db6 100644 --- a/src/lib/subs/satmap.c +++ b/src/lib/subs/satmap.c @@ -35,7 +35,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "map.h" #include "misc.h" diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c index 8bc4056f..679b7e42 100644 --- a/src/lib/subs/sect.c +++ b/src/lib/subs/sect.c @@ -35,7 +35,6 @@ #include #include -#include "file.h" #include "game.h" #include "lost.h" #include "misc.h" diff --git a/src/lib/subs/sectdamage.c b/src/lib/subs/sectdamage.c index 82419698..6b0f62ae 100644 --- a/src/lib/subs/sectdamage.c +++ b/src/lib/subs/sectdamage.c @@ -35,7 +35,6 @@ #include "combat.h" #include "damage.h" -#include "file.h" #include "land.h" #include "misc.h" #include "nsc.h" diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c index cfd4bced..d4deb693 100644 --- a/src/lib/subs/ship.c +++ b/src/lib/subs/ship.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "lost.h" #include "misc.h" #include "optlist.h" diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index 8fc33ad7..abeb9530 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -37,7 +37,6 @@ #include #include -#include "file.h" #include "game.h" #include "item.h" #include "land.h" diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index f9c55c77..84966d47 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -38,7 +38,6 @@ #include "chance.h" #include "damage.h" #include "empobj.h" -#include "file.h" #include "map.h" #include "misc.h" #include "mission.h" diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c index 62713a5e..c2dbaffc 100644 --- a/src/lib/subs/snxtitem.c +++ b/src/lib/subs/snxtitem.c @@ -38,7 +38,6 @@ #include "player.h" #include "xy.h" #include "nsc.h" -#include "file.h" #include "prototypes.h" #include "unit.h" diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c index a73b6dc6..87905dfa 100644 --- a/src/lib/subs/snxtsct.c +++ b/src/lib/subs/snxtsct.c @@ -33,7 +33,6 @@ #include -#include "file.h" #include "misc.h" #include "nat.h" #include "nsc.h" diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c index 0874fee8..9c1f330f 100644 --- a/src/lib/subs/supply.c +++ b/src/lib/subs/supply.c @@ -35,7 +35,6 @@ #include #include "chance.h" #include "empobj.h" -#include "file.h" #include "land.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c index 05ee05f2..484cc378 100644 --- a/src/lib/subs/takeover.c +++ b/src/lib/subs/takeover.c @@ -35,7 +35,6 @@ #include #include "chance.h" -#include "file.h" #include "empobj.h" #include "game.h" #include "land.h" diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c index 69ca0acd..390f467a 100644 --- a/src/lib/subs/trdsub.c +++ b/src/lib/subs/trdsub.c @@ -35,7 +35,6 @@ #include #include "empobj.h" -#include "file.h" #include "item.h" #include "land.h" #include "loan.h" diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c index 32c84883..2b3553c1 100644 --- a/src/lib/subs/unitsub.c +++ b/src/lib/subs/unitsub.c @@ -34,7 +34,6 @@ #include #include -#include "file.h" #include "map.h" #include "optlist.h" #include "path.h" diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c index d40af3e7..e4a6d785 100644 --- a/src/lib/subs/wu.c +++ b/src/lib/subs/wu.c @@ -37,7 +37,6 @@ #include #include #include -#include "file.h" #include "misc.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/update/age.c b/src/lib/update/age.c index 78da8c5b..a0d69533 100644 --- a/src/lib/update/age.c +++ b/src/lib/update/age.c @@ -33,7 +33,6 @@ #include #include "chance.h" -#include "file.h" #include "nat.h" #include "optlist.h" #include "update.h" diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c index f2f8e31f..c55cd0be 100644 --- a/src/lib/update/deliver.c +++ b/src/lib/update/deliver.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "item.h" #include "optlist.h" #include "path.h" diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c index 6f0bfa7b..bcec787a 100644 --- a/src/lib/update/distribute.c +++ b/src/lib/update/distribute.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "item.h" #include "optlist.h" #include "path.h" diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c index 6cba5501..95811c59 100644 --- a/src/lib/update/finish.c +++ b/src/lib/update/finish.c @@ -37,7 +37,6 @@ #include #include -#include "file.h" #include "nat.h" #include "optlist.h" #include "path.h" diff --git a/src/lib/update/land.c b/src/lib/update/land.c index e9e901e1..e6434cf3 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -37,7 +37,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "lost.h" #include "nat.h" diff --git a/src/lib/update/main.c b/src/lib/update/main.c index 9214c59a..a19be3bf 100644 --- a/src/lib/update/main.c +++ b/src/lib/update/main.c @@ -37,7 +37,6 @@ #include #include "empthread.h" -#include "file.h" #include "game.h" #include "journal.h" #include "optlist.h" diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c index 6dc9ea07..99565dbf 100644 --- a/src/lib/update/mobility.c +++ b/src/lib/update/mobility.c @@ -34,7 +34,6 @@ #include -#include "file.h" #include "game.h" #include "land.h" #include "optlist.h" diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c index 10878e21..6b2e23bb 100644 --- a/src/lib/update/move_sat.c +++ b/src/lib/update/move_sat.c @@ -33,7 +33,6 @@ #include #include -#include "file.h" #include "nat.h" #include "nsc.h" #include "optlist.h" diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index 1300cba0..73a2c4a1 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -36,7 +36,6 @@ #include #include "chance.h" -#include "file.h" #include "game.h" #include "item.h" #include "optlist.h" diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c index dfd20ae7..d44e8fe4 100644 --- a/src/lib/update/nxtitemp.c +++ b/src/lib/update/nxtitemp.c @@ -33,7 +33,6 @@ #include #include "empobj.h" -#include "file.h" #include "land.h" #include "nsc.h" #include "prototypes.h" diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c index 1ec32114..1785dc7f 100644 --- a/src/lib/update/plague.c +++ b/src/lib/update/plague.c @@ -34,7 +34,6 @@ #include #include "chance.h" -#include "file.h" #include "item.h" #include "lost.h" #include "optlist.h" diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c index 39820e91..0bec6d67 100644 --- a/src/lib/update/plane.c +++ b/src/lib/update/plane.c @@ -35,7 +35,6 @@ #include #include "chance.h" -#include "file.h" #include "lost.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c index a593151d..99c06799 100644 --- a/src/lib/update/populace.c +++ b/src/lib/update/populace.c @@ -34,7 +34,6 @@ #include #include "chance.h" -#include "file.h" #include "lost.h" #include "optlist.h" #include "prototypes.h" diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c index 52b455a3..364ae80c 100644 --- a/src/lib/update/prepare.c +++ b/src/lib/update/prepare.c @@ -36,7 +36,6 @@ #include #include "chance.h" -#include "file.h" #include "item.h" #include "nat.h" #include "optlist.h" diff --git a/src/lib/update/removewants.c b/src/lib/update/removewants.c index fd557cc6..612d6a9b 100644 --- a/src/lib/update/removewants.c +++ b/src/lib/update/removewants.c @@ -32,7 +32,6 @@ #include -#include "file.h" #include "nat.h" #include "update.h" diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c index 94b2dfcd..25a24cc3 100644 --- a/src/lib/update/revolt.c +++ b/src/lib/update/revolt.c @@ -35,7 +35,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "lost.h" #include "nat.h" diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index d738176c..3dd72b8e 100644 --- a/src/lib/update/sect.c +++ b/src/lib/update/sect.c @@ -35,7 +35,6 @@ #include #include "chance.h" -#include "file.h" #include "item.h" #include "land.h" #include "lost.h" diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c index 1e59889b..e97c8d92 100644 --- a/src/lib/update/ship.c +++ b/src/lib/update/ship.c @@ -37,7 +37,6 @@ #include #include "chance.h" -#include "file.h" #include "land.h" #include "lost.h" #include "nat.h" diff --git a/src/server/update.c b/src/server/update.c index 195eaa1a..cb46f66a 100644 --- a/src/server/update.c +++ b/src/server/update.c @@ -42,7 +42,6 @@ #include #include "chance.h" #include "empthread.h" -#include "file.h" #include "game.h" #include "misc.h" #include "optlist.h" diff --git a/src/util/empdump.c b/src/util/empdump.c index c64bc12f..abbbddd1 100644 --- a/src/util/empdump.c +++ b/src/util/empdump.c @@ -37,7 +37,6 @@ #include #include #include -#include "file.h" #include "optlist.h" #include "nat.h" #include "prototypes.h" diff --git a/src/util/fairland.c b/src/util/fairland.c index db7500f7..3128d3fb 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -72,7 +72,6 @@ static int quiet = 0; #include #include #include "chance.h" -#include "file.h" #include "optlist.h" #include "prototypes.h" #include "sect.h" diff --git a/src/util/files.c b/src/util/files.c index cde8de05..722b4894 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -38,7 +38,6 @@ #include #include #include -#include "file.h" #include "nat.h" #include "optlist.h" #include "prototypes.h"