From 404095d2faced0f497a8644aeb4a51a93e981b17 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 18 Aug 2007 17:03:14 +0000 Subject: [PATCH] Trim system includes. --- src/lib/commands/anti.c | 1 - src/lib/commands/foll.c | 1 - src/lib/commands/marc.c | 1 - src/lib/commands/mobq.c | 1 - src/lib/commands/navi.c | 1 - src/lib/commands/orde.c | 1 - src/lib/commands/rada.c | 1 - src/lib/commands/sail.c | 1 - src/lib/commands/setres.c | 1 - src/lib/commands/setsect.c | 1 - src/lib/commands/swap.c | 1 - src/lib/common/conftab.c | 1 - src/lib/common/damage.c | 1 - src/lib/common/file.c | 1 - src/lib/common/fsize.c | 2 -- src/lib/common/hap_fact.c | 2 -- src/lib/common/hours.c | 1 - src/lib/common/rdsched.c | 1 - src/lib/common/wantupd.c | 3 --- src/lib/common/xy.c | 1 - src/lib/gen/io.c | 10 ++-------- src/lib/gen/ioqueue.c | 1 - src/lib/lwp/lwp.c | 1 - src/lib/lwp/sel.c | 2 -- src/lib/player/accept.c | 7 ++----- src/lib/player/empdis.c | 4 ---- src/lib/player/player.c | 7 ++----- src/lib/subs/pr.c | 2 -- src/lib/subs/retreat.c | 1 - src/lib/subs/sarg.c | 1 - src/lib/subs/takeover.c | 1 - src/lib/subs/wu.c | 3 +-- src/lib/update/nav_ship.c | 2 -- src/lib/update/nav_util.c | 1 - src/util/fairland.c | 5 +---- src/util/files.c | 6 +----- 36 files changed, 9 insertions(+), 69 deletions(-) diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c index 5ae53993..9fb4535a 100644 --- a/src/lib/commands/anti.c +++ b/src/lib/commands/anti.c @@ -34,7 +34,6 @@ #include -#include #include "commands.h" #include "item.h" #include "lost.h" diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c index 36ab6f2d..2aefc906 100644 --- a/src/lib/commands/foll.c +++ b/src/lib/commands/foll.c @@ -36,7 +36,6 @@ #include "commands.h" #include "optlist.h" #include "ship.h" -#include int foll(void) diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c index e4e288cc..b7c3bda8 100644 --- a/src/lib/commands/marc.c +++ b/src/lib/commands/marc.c @@ -35,7 +35,6 @@ #include -#include #include "commands.h" #include "file.h" #include "map.h" diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c index b0a2ea0c..81a8cca0 100644 --- a/src/lib/commands/mobq.c +++ b/src/lib/commands/mobq.c @@ -33,7 +33,6 @@ #include -#include #include "commands.h" #include "optlist.h" #include "ship.h" diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c index 491f335a..0d0dcc40 100644 --- a/src/lib/commands/navi.c +++ b/src/lib/commands/navi.c @@ -34,7 +34,6 @@ #include -#include #include "commands.h" #include "map.h" #include "optlist.h" diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c index 06a2a1a2..96164878 100644 --- a/src/lib/commands/orde.c +++ b/src/lib/commands/orde.c @@ -34,7 +34,6 @@ #include -#include #include "commands.h" #include "item.h" #include "optlist.h" diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c index 7e57c4f9..aa092c19 100644 --- a/src/lib/commands/rada.c +++ b/src/lib/commands/rada.c @@ -33,7 +33,6 @@ #include -#include #include "commands.h" #include "optlist.h" #include "empobj.h" diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c index 47ed3fe9..3eb08b5a 100644 --- a/src/lib/commands/sail.c +++ b/src/lib/commands/sail.c @@ -33,7 +33,6 @@ #include -#include #include "commands.h" #include "optlist.h" #include "path.h" diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c index 602d80ae..4f716530 100644 --- a/src/lib/commands/setres.c +++ b/src/lib/commands/setres.c @@ -35,7 +35,6 @@ #include -#include #include "commands.h" /* diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c index e0bc4d11..34f14d08 100644 --- a/src/lib/commands/setsect.c +++ b/src/lib/commands/setsect.c @@ -34,7 +34,6 @@ #include -#include #include "commands.h" #include "lost.h" #include "news.h" diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c index c5bd8a36..c9aad841 100644 --- a/src/lib/commands/swap.c +++ b/src/lib/commands/swap.c @@ -33,7 +33,6 @@ #include -#include #include "commands.h" static void print_res(struct sctstr *); diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c index 0e596d97..e92b316b 100644 --- a/src/lib/common/conftab.c +++ b/src/lib/common/conftab.c @@ -35,7 +35,6 @@ #include #include -#include #include "file.h" #include "optlist.h" #include "product.h" diff --git a/src/lib/common/damage.c b/src/lib/common/damage.c index 9251930a..6a8ee84c 100644 --- a/src/lib/common/damage.c +++ b/src/lib/common/damage.c @@ -34,7 +34,6 @@ #include -#include #include "damage.h" #include "land.h" #include "misc.h" diff --git a/src/lib/common/file.c b/src/lib/common/file.c index f7e25b4d..9a2115b4 100644 --- a/src/lib/common/file.c +++ b/src/lib/common/file.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include "file.h" diff --git a/src/lib/common/fsize.c b/src/lib/common/fsize.c index 34cad2c0..a2c1ff40 100644 --- a/src/lib/common/fsize.c +++ b/src/lib/common/fsize.c @@ -35,10 +35,8 @@ #include -#include #include #include - #include "prototypes.h" /* diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c index b66de12e..b0d70dd7 100644 --- a/src/lib/common/hap_fact.c +++ b/src/lib/common/hap_fact.c @@ -33,8 +33,6 @@ #include -#include -#include #include "misc.h" #include "nat.h" #include "nsc.h" diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c index a9f09630..7fadfc54 100644 --- a/src/lib/common/hours.c +++ b/src/lib/common/hours.c @@ -37,7 +37,6 @@ #include #include -#include #include #include "misc.h" #include "optlist.h" diff --git a/src/lib/common/rdsched.c b/src/lib/common/rdsched.c index 2131de51..8875c15a 100644 --- a/src/lib/common/rdsched.c +++ b/src/lib/common/rdsched.c @@ -35,7 +35,6 @@ #include -#include #include #include #include diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c index 439a9294..406032ac 100644 --- a/src/lib/common/wantupd.c +++ b/src/lib/common/wantupd.c @@ -33,10 +33,7 @@ #include -#include -#include #include -#include #include "file.h" #include "game.h" #include "misc.h" diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c index 7c93e11d..1f702177 100644 --- a/src/lib/common/xy.c +++ b/src/lib/common/xy.c @@ -33,7 +33,6 @@ #include -#include #include #include #include diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c index ab2bebda..5511fc78 100644 --- a/src/lib/gen/io.c +++ b/src/lib/gen/io.c @@ -44,23 +44,17 @@ #include #include #include +#include #include #include -#if !defined(_WIN32) -#include -#endif -#include #include -#include - #include "empio.h" +#include "empthread.h" #include "ioqueue.h" #include "misc.h" #include "queue.h" #include "server.h" -#include "empthread.h" - struct iop { int fd; struct ioqueue *input; diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c index 926c0f55..42f57a72 100644 --- a/src/lib/gen/ioqueue.c +++ b/src/lib/gen/ioqueue.c @@ -39,7 +39,6 @@ #include -#include #include #include #include diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c index d5602b1b..e8fe2ce0 100644 --- a/src/lib/lwp/lwp.c +++ b/src/lib/lwp/lwp.c @@ -34,7 +34,6 @@ #include -#include #include #include "lwp.h" #include "lwpint.h" diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c index ea187982..3a645719 100644 --- a/src/lib/lwp/sel.c +++ b/src/lib/lwp/sel.c @@ -36,8 +36,6 @@ #include #include -#include -#include #include #include #include diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index f01b7f87..f8e72f7d 100644 --- a/src/lib/player/accept.c +++ b/src/lib/player/accept.c @@ -34,19 +34,16 @@ #include +#include +#include #include #include #if !defined(_WIN32) #include #include #include -#include #endif #include -#include -#include -#include -#include #include "empio.h" #include "empthread.h" diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index 2e2dc267..050c6940 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -36,11 +36,7 @@ #include #include -#include #include -#include -#include - #include "com.h" #include "empio.h" #include "file.h" diff --git a/src/lib/player/player.c b/src/lib/player/player.c index a52d8608..dc919f47 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -32,11 +32,9 @@ */ #include -#include -#include -#include -#include +#include +#include #include "com.h" #include "empio.h" #include "empthread.h" @@ -47,7 +45,6 @@ #include "optlist.h" #include "player.h" #include "proto.h" -#include "proto.h" #include "prototypes.h" #include "sect.h" #include "tel.h" diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index 7fed1f28..f24172a7 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -51,8 +51,6 @@ #include -#include -#include #include #include #include "com.h" diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 5e027ead..d46418ef 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -33,7 +33,6 @@ #include -#include #include "damage.h" #include "file.h" #include "land.h" diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c index 872741c9..f9f2a9e8 100644 --- a/src/lib/subs/sarg.c +++ b/src/lib/subs/sarg.c @@ -35,7 +35,6 @@ #include #include -#include #include "file.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c index 148fd68e..7da09e48 100644 --- a/src/lib/subs/takeover.c +++ b/src/lib/subs/takeover.c @@ -34,7 +34,6 @@ #include -#include #include "file.h" #include "game.h" #include "land.h" diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c index 85fccc56..03bb39e0 100644 --- a/src/lib/subs/wu.c +++ b/src/lib/subs/wu.c @@ -35,11 +35,10 @@ #include #include -#include -#include #if !defined(_WIN32) #include #endif +#include #include "file.h" #include "misc.h" #include "nat.h" diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c index ae415f7a..f867513b 100644 --- a/src/lib/update/nav_ship.c +++ b/src/lib/update/nav_ship.c @@ -34,8 +34,6 @@ #include - -#include #include "nsc.h" #include "path.h" #include "update.h" diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c index e0e55bb5..69066faa 100644 --- a/src/lib/update/nav_util.c +++ b/src/lib/update/nav_util.c @@ -33,7 +33,6 @@ #include -#include #include "item.h" #include "land.h" #include "nsc.h" diff --git a/src/util/fairland.c b/src/util/fairland.c index afceb3ab..79481800 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -66,12 +66,9 @@ static int quiet = 0; /* lower URAN_MIN for more uranium */ #define URAN_MIN 56 -#include - -#include #include #include -#include +#include #include "file.h" #include "misc.h" #include "nat.h" diff --git a/src/util/files.c b/src/util/files.c index ab214723..62a365c0 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -35,14 +35,10 @@ #include +#include #include #include -#include -#if defined(_WIN32) -#include -#endif #include - #include "file.h" #include "game.h" #include "land.h"