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 <armbru@pond.sub.org>

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"

include/commodity.h

@@ -35,7 +35,7 @@
 #ifndef COMMODITY_H
 #define COMMODITY_H
 
-#include <time.h>
+#include "file.h"
 #include "types.h"
 #include "item.h"
 

include/game.h

@@ -33,7 +33,7 @@
 #ifndef GAME_H
 #define GAME_H
 
-#include <time.h>
+#include "file.h"
 
 struct gamestr {
     /* initial part must match struct empobj */

include/land.h

@@ -36,7 +36,7 @@
 #ifndef LAND_H
 #define LAND_H
 
-#include <time.h>
+#include "file.h"
 #include "item.h"
 #include "retreat.h"
 #include "types.h"

include/loan.h

@@ -33,7 +33,7 @@
 #ifndef LOAN_H
 #define LOAN_H
 
-#include <time.h>
+#include "file.h"
 #include "types.h"
 
 #define MAXLOAN		100000

include/lost.h

@@ -33,7 +33,7 @@
 #ifndef LOST_H
 #define LOST_H
 
-#include <time.h>
+#include "file.h"
 #include "types.h"
 
 struct loststr {

include/nat.h

@@ -37,7 +37,7 @@
 #ifndef NAT_H
 #define NAT_H
 
-#include <time.h>
+#include "file.h"
 #include "types.h"
 
 #define NATID_BAD 255

include/news.h

@@ -40,7 +40,7 @@
 #ifndef NEWS_H
 #define NEWS_H
 
-#include <time.h>
+#include "file.h"
 #include "nsc.h"
 
 struct nwsstr {

include/nuke.h

@@ -34,7 +34,7 @@
 #ifndef NUKE_H
 #define NUKE_H
 
-#include <time.h>
+#include "file.h"
 #include "item.h"
 #include "types.h"
 

include/plane.h

@@ -36,7 +36,7 @@
 #ifndef PLANE_H
 #define PLANE_H
 
-#include <time.h>
+#include "file.h"
 #include "item.h"
 #include "queue.h"
 #include "types.h"

include/power.h

@@ -33,6 +33,7 @@
 #ifndef POWER_H
 #define POWER_H
 
+#include "file.h"
 #include "types.h"
 
 struct powstr {

include/sect.h

@@ -37,7 +37,7 @@
 #ifndef SECT_H
 #define SECT_H
 
-#include <time.h>
+#include "file.h"
 #include "item.h"
 #include "types.h"
 

include/ship.h

@@ -37,7 +37,7 @@
 #ifndef SHIP_H
 #define SHIP_H
 
-#include <time.h>
+#include "file.h"
 #include "item.h"
 #include "retreat.h"
 #include "types.h"

include/trade.h

@@ -36,7 +36,7 @@
 #ifndef TRADE_H
 #define TRADE_H
 
-#include <time.h>
+#include "file.h"
 #include "types.h"
 
 struct trdstr {

src/lib/common/btu.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "nat.h"
 #include "optlist.h"
 #include "sect.h"

src/lib/common/cargo.c

@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "file.h"
 #include "unit.h"
 
 struct clink {

src/lib/common/cnumb.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "match.h"
 #include "nat.h"
 #include "prototypes.h"

src/lib/common/ef_verify.c

@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "empobj.h"
-#include "file.h"
 #include "misc.h"
 #include "nsc.h"
 #include "product.h"

src/lib/common/empobj.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include "empobj.h"
-#include "file.h"
 #include "news.h"
 #include "optlist.h"
 #include "product.h"

src/lib/common/filetable.c

@@ -35,7 +35,6 @@
 #include <assert.h>
 #include <stddef.h>
 #include "commodity.h"
-#include "file.h"
 #include "game.h"
 #include "land.h"
 #include "loan.h"

src/lib/common/game.c

@@ -43,7 +43,6 @@
 #include <config.h>
 
 #include <math.h>
-#include "file.h"
 #include "game.h"
 #include "optlist.h"
 #include "server.h"

src/lib/common/move.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"

src/lib/common/nat.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include <string.h>
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"

src/lib/common/nsc.c

@@ -39,7 +39,6 @@
 
 #include <stdlib.h>
 #include "empobj.h"
-#include "file.h"
 #include "optlist.h"
 #include "news.h"
 #include "nsc.h"

src/lib/common/nstreval.c

@@ -37,7 +37,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include "file.h"
 #include "nat.h"
 #include "nsc.h"
 #include "optlist.h"

src/lib/common/pathfind.c

@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "file.h"
 #include "nat.h"
 #include "optlist.h"
 #include "path.h"

src/lib/common/tfact.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nat.h"
 
 double

src/lib/common/type.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "item.h"
 #include "land.h"
 #include "match.h"

src/lib/common/wantupd.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include <time.h>
-#include "file.h"
 #include "game.h"
 #include "misc.h"
 #include "nat.h"

src/lib/common/xdump.c

@@ -75,7 +75,6 @@
 
 #include <ctype.h>
 #include <limits.h>
-#include "file.h"
 #include "nat.h"
 #include "xdump.h"
 

src/lib/common/xundump.c

@@ -58,7 +58,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "file.h"
 #include "match.h"
 #include "nat.h"
 #include "nsc.h"

src/lib/common/xy.c

@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"

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"

src/lib/player/empdis.c

@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "com.h"
-#include "file.h"
 #include "game.h"
 #include "match.h"
 #include "misc.h"

src/lib/player/init_nats.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "game.h"
 #include "misc.h"
 #include "nat.h"

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"

src/lib/player/nat.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nat.h"
 #include "prototypes.h"
 

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"

src/lib/subs/actofgod.c

@@ -34,7 +34,6 @@
 
 #include <stdarg.h>
 #include "actofgod.h"
-#include "file.h"
 #include "news.h"
 #include "optlist.h"
 #include "player.h"

src/lib/subs/aircombat.c

@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "land.h"
 #include "map.h"
 #include "misc.h"

src/lib/subs/aswplnsubs.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "plane.h"

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"

src/lib/subs/bridgefall.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "land.h"
 #include "misc.h"
 #include "nsc.h"

src/lib/subs/bsanct.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "game.h"
 #include "news.h"
 #include "player.h"

src/lib/subs/caploss.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "commodity.h"
-#include "file.h"
 #include "loan.h"
 #include "nat.h"
 #include "news.h"

src/lib/subs/check.c

@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include "commodity.h"
 #include "empobj.h"
-#include "file.h"
 #include "player.h"
 #include "prototypes.h"
 #include "xy.h"

src/lib/subs/coastal.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "path.h"
 #include "prototypes.h"
 #include "sect.h"

src/lib/subs/control.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "land.h"
 #include "nsc.h"
 #include "player.h"

src/lib/subs/detonate.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "land.h"
 #include "map.h"
 #include "misc.h"

src/lib/subs/disloan.c

@@ -42,7 +42,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "loan.h"
 #include "nat.h"
 #include "player.h"

src/lib/subs/fileinit.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nsc.h"
 #include "prototypes.h"
 #include "unit.h"

src/lib/subs/fortdef.c

@@ -38,7 +38,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nat.h"
 #include "news.h"
 #include "optlist.h"

src/lib/subs/land.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "land.h"
 #include "lost.h"
 #include "misc.h"

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"

src/lib/subs/list.c

@@ -35,7 +35,6 @@
 
 #include <ctype.h>
 #include "chance.h"
-#include "file.h"
 #include "land.h"
 #include "misc.h"
 #include "nat.h"

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"

src/lib/subs/lostsub.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "lost.h"
 #include "misc.h"
 #include "optlist.h"

src/lib/subs/maps.c

@@ -38,7 +38,6 @@
 #include <ctype.h>
 #include "com.h"
 #include "empobj.h"
-#include "file.h"
 #include "land.h"
 #include "map.h"
 #include "match.h"

src/lib/subs/mission.c

@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include "chance.h"
 #include "empobj.h"
-#include "file.h"
 #include "item.h"
 #include "misc.h"
 #include "mission.h"

src/lib/subs/move.c

@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "chance.h"
 #include "damage.h"
-#include "file.h"
 #include "map.h"
 #include "nsc.h"
 #include "path.h"

src/lib/subs/mslsub.c

@@ -36,7 +36,6 @@
 
 #include <stdlib.h>
 #include "chance.h"
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "news.h"

src/lib/subs/natarg.c

@@ -34,7 +34,6 @@
 
 #include <ctype.h>
 #include <stdlib.h>
-#include "file.h"
 #include "match.h"
 #include "misc.h"
 #include "nat.h"

src/lib/subs/natsub.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "file.h"
 #include "nat.h"
 #include "prototypes.h"
 

src/lib/subs/neigh.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "path.h"
 #include "prototypes.h"
 #include "sect.h"

src/lib/subs/nreport.c

@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "nat.h"
 #include "news.h"
 #include "optlist.h"

src/lib/subs/nuke.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "lost.h"
 #include "misc.h"
 #include "nuke.h"

src/lib/subs/nxtitem.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "empobj.h"
-#include "file.h"
 #include "land.h"
 #include "misc.h"
 #include "nsc.h"

src/lib/subs/paths.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "optlist.h"
 #include "path.h"
 #include "player.h"

src/lib/subs/plane.c

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

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"

src/lib/subs/pr.c

@@ -53,7 +53,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include "empio.h"
-#include "file.h"
 #include "journal.h"
 #include "misc.h"
 #include "nat.h"

src/lib/subs/radmap.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include "file.h"
 #include "map.h"
 #include "misc.h"
 #include "nat.h"

src/lib/subs/rej.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nat.h"
 #include "news.h"
 #include "optlist.h"

src/lib/subs/retreat.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nsc.h"
 #include "path.h"
 #include "player.h"

src/lib/subs/sarg.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"

src/lib/subs/satmap.c

@@ -35,7 +35,6 @@
 
 #include <stdlib.h>
 #include "chance.h"
-#include "file.h"
 #include "land.h"
 #include "map.h"
 #include "misc.h"

src/lib/subs/sect.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "file.h"
 #include "game.h"
 #include "lost.h"
 #include "misc.h"

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"

src/lib/subs/ship.c

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

src/lib/subs/show.c

@@ -37,7 +37,6 @@
 #include <config.h>
 
 #include <math.h>
-#include "file.h"
 #include "game.h"
 #include "item.h"
 #include "land.h"

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"

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"
 

src/lib/subs/snxtsct.c

@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"

src/lib/subs/supply.c

@@ -35,7 +35,6 @@
 #include <math.h>
 #include "chance.h"
 #include "empobj.h"
-#include "file.h"
 #include "land.h"
 #include "nat.h"
 #include "optlist.h"

src/lib/subs/takeover.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "empobj.h"
 #include "game.h"
 #include "land.h"

src/lib/subs/trdsub.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include "empobj.h"
-#include "file.h"
 #include "item.h"
 #include "land.h"
 #include "loan.h"

src/lib/subs/unitsub.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <math.h>
-#include "file.h"
 #include "map.h"
 #include "optlist.h"
 #include "path.h"

src/lib/subs/wu.c

@@ -37,7 +37,6 @@
 #include <stdarg.h>
 #include <sys/uio.h>
 #include <unistd.h>
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"

src/lib/update/age.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "nat.h"
 #include "optlist.h"
 #include "update.h"

src/lib/update/deliver.c

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "item.h"
 #include "optlist.h"
 #include "path.h"

src/lib/update/distribute.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "item.h"
 #include "optlist.h"
 #include "path.h"

src/lib/update/finish.c

@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <sys/resource.h>
-#include "file.h"
 #include "nat.h"
 #include "optlist.h"
 #include "path.h"

src/lib/update/land.c

@@ -37,7 +37,6 @@
 
 #include <math.h>
 #include "chance.h"
-#include "file.h"
 #include "land.h"
 #include "lost.h"
 #include "nat.h"

src/lib/update/main.c

@@ -37,7 +37,6 @@
 
 #include <sys/resource.h>
 #include "empthread.h"
-#include "file.h"
 #include "game.h"
 #include "journal.h"
 #include "optlist.h"

src/lib/update/mobility.c

@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "game.h"
 #include "land.h"
 #include "optlist.h"

src/lib/update/move_sat.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include <math.h>
-#include "file.h"
 #include "nat.h"
 #include "nsc.h"
 #include "optlist.h"

src/lib/update/nat.c

@@ -36,7 +36,6 @@
 
 #include <math.h>
 #include "chance.h"
-#include "file.h"
 #include "game.h"
 #include "item.h"
 #include "optlist.h"

src/lib/update/nxtitemp.c

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "empobj.h"
-#include "file.h"
 #include "land.h"
 #include "nsc.h"
 #include "prototypes.h"

src/lib/update/plague.c

@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "item.h"
 #include "lost.h"
 #include "optlist.h"

src/lib/update/plane.c

@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "lost.h"
 #include "nat.h"
 #include "optlist.h"