From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 18 Aug 2007 17:03:14 +0000 (+0000)
Subject: Trim system includes.
X-Git-Tag: v4.3.10~56
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=404095d2faced0f497a8644aeb4a51a93e981b17

Trim system includes.
---

diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index 5ae539932..9fb4535a4 100644
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "item.h"
 #include "lost.h"
diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index 36ab6f2d3..2aefc906e 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 <ctype.h>
 
 int
 foll(void)
diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index e4e288cc5..b7c3bda89 100644
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -35,7 +35,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "file.h"
 #include "map.h"
diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c
index b0a2ea0c2..81a8cca04 100644
--- a/src/lib/commands/mobq.c
+++ b/src/lib/commands/mobq.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "optlist.h"
 #include "ship.h"
diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 491f335a4..0d0dcc403 100644
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "map.h"
 #include "optlist.h"
diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 06a2a1a26..96164878c 100644
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "item.h"
 #include "optlist.h"
diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index 7e57c4f95..aa092c19d 100644
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "optlist.h"
 #include "empobj.h"
diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index 47ed3fe96..3eb08b5ab 100644
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "optlist.h"
 #include "path.h"
diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 602d80aea..4f716530b 100644
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -35,7 +35,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 
 /*
diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index e0bc4d111..34f14d08b 100644
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 #include "lost.h"
 #include "news.h"
diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index c5bd8a362..c9aad8418 100644
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
 
 static void print_res(struct sctstr *);
diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c
index 0e596d977..e92b316b2 100644
--- a/src/lib/common/conftab.c
+++ b/src/lib/common/conftab.c
@@ -35,7 +35,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <time.h>
 #include "file.h"
 #include "optlist.h"
 #include "product.h"
diff --git a/src/lib/common/damage.c b/src/lib/common/damage.c
index 9251930a0..6a8ee84c1 100644
--- a/src/lib/common/damage.c
+++ b/src/lib/common/damage.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <fcntl.h>
 #include "damage.h"
 #include "land.h"
 #include "misc.h"
diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index f7e25b4d3..9a2115b41 100644
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -38,7 +38,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <signal.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include "file.h"
diff --git a/src/lib/common/fsize.c b/src/lib/common/fsize.c
index 34cad2c0b..a2c1ff402 100644
--- a/src/lib/common/fsize.c
+++ b/src/lib/common/fsize.c
@@ -35,10 +35,8 @@
 
 #include <config.h>
 
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-
 #include "prototypes.h"
 
 /*
diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c
index b66de12ed..b0d70dd74 100644
--- a/src/lib/common/hap_fact.c
+++ b/src/lib/common/hap_fact.c
@@ -33,8 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include <stdio.h>
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c
index a9f09630a..7fadfc546 100644
--- a/src/lib/common/hours.c
+++ b/src/lib/common/hours.c
@@ -37,7 +37,6 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <limits.h>
 #include <time.h>
 #include "misc.h"
 #include "optlist.h"
diff --git a/src/lib/common/rdsched.c b/src/lib/common/rdsched.c
index 2131de51a..8875c15ac 100644
--- a/src/lib/common/rdsched.c
+++ b/src/lib/common/rdsched.c
@@ -35,7 +35,6 @@
 
 #include <config.h>
 
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index 439a92948..406032acd 100644
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -33,10 +33,7 @@
 
 #include <config.h>
 
-#include <fcntl.h>
-#include <stdio.h>
 #include <time.h>
-#include <unistd.h>
 #include "file.h"
 #include "game.h"
 #include "misc.h"
diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index 7c93e11d1..1f7021770 100644
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c
index ab2bebda4..5511fc785 100644
--- a/src/lib/gen/io.c
+++ b/src/lib/gen/io.c
@@ -44,23 +44,17 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/uio.h>
-#if !defined(_WIN32)
-#include <sys/file.h>
-#endif
-#include <sys/socket.h>
 #include <unistd.h>
-#include <time.h>
-
 #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 926c0f55f..42f57a727 100644
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -39,7 +39,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/uio.h>
diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index d5602b1bc..e8fe2ce0a 100644
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include "lwp.h"
 #include "lwpint.h"
diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c
index ea1879827..3a6457199 100644
--- a/src/lib/lwp/sel.c
+++ b/src/lib/lwp/sel.c
@@ -36,8 +36,6 @@
 #include <config.h>
 
 #include <errno.h>
-#include <sys/uio.h>
-#include <sys/file.h>
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index f01b7f872..f8e72f7d2 100644
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -34,19 +34,16 @@
 
 #include <config.h>
 
+#include <errno.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #if !defined(_WIN32)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/ioctl.h>
 #endif
 #include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
 
 #include "empio.h"
 #include "empthread.h"
diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c
index 2e2dc267a..050c69400 100644
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -36,11 +36,7 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <fcntl.h>
 #include <time.h>
-#include <unistd.h>
-#include <signal.h>
-
 #include "com.h"
 #include "empio.h"
 #include "file.h"
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index a52d8608a..dc919f478 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -32,11 +32,9 @@
  */
 
 #include <config.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
 
+#include <errno.h>
+#include <stdio.h>
 #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 7fed1f284..f24172a74 100644
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -51,8 +51,6 @@
 
 #include <config.h>
 
-#include <fcntl.h>
-#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "com.h"
diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 5e027ead5..d46418ef1 100644
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <stdlib.h>
 #include "damage.h"
 #include "file.h"
 #include "land.h"
diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c
index 872741c9c..f9f2a9e89 100644
--- a/src/lib/subs/sarg.c
+++ b/src/lib/subs/sarg.c
@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <stdlib.h>
 #include "file.h"
 #include "misc.h"
 #include "nat.h"
diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 148fd68e6..7da09e48a 100644
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include <stdlib.h>
 #include "file.h"
 #include "game.h"
 #include "land.h"
diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c
index 85fccc560..03bb39e07 100644
--- a/src/lib/subs/wu.c
+++ b/src/lib/subs/wu.c
@@ -35,11 +35,10 @@
 
 #include <fcntl.h>
 #include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
 #if !defined(_WIN32)
 #include <sys/uio.h>
 #endif
+#include <unistd.h>
 #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 ae415f7a2..f867513bc 100644
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.c
@@ -34,8 +34,6 @@
 
 #include <config.h>
 
-
-#include <ctype.h>
 #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 e0e55bb58..69066faa6 100644
--- a/src/lib/update/nav_util.c
+++ b/src/lib/update/nav_util.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include "item.h"
 #include "land.h"
 #include "nsc.h"
diff --git a/src/util/fairland.c b/src/util/fairland.c
index afceb3abb..794818006 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 <unistd.h>
-
-#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <fcntl.h>
+#include <unistd.h>
 #include "file.h"
 #include "misc.h"
 #include "nat.h"
diff --git a/src/util/files.c b/src/util/files.c
index ab214723f..62a365c07 100644
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -35,14 +35,10 @@
 
 #include <config.h>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <errno.h>
-#if defined(_WIN32)
-#include <direct.h>
-#endif
 #include <unistd.h>
-
 #include "file.h"
 #include "game.h"
 #include "land.h"