Break inclusion cycle: prototypes.h and commands.h included each

other.  Ensure headers in include/ can be included in any order
(except for econfig-spec.h, which is special).  New header types.h to
help avoid inclusion cycles.  Sort include directives.  Remove some
superflous includes.

diff --git a/include/budg.h b/include/budg.h
index 0b112bc843b70a5ebda28b81df4acec769453937..82f65ed183117355d19d7e1c5f47c5a774ebc956 100644 (file)
--- a/include/budg.h
+++ b/include/budg.h
@@ -34,6 +34,9 @@
 #ifndef BUDG_H
 #define BUDG_H
 
+#include "types.h"
+#include "item.h"
+
 #define SCT_EFFIC (SCT_TYPE_MAX + 1)
 
 void fill_update_array(int *bp, struct sctstr *sp);

diff --git a/include/combat.h b/include/combat.h
index d390c2c581a6c7407f4d23774e74ed9e84d4ce78..19607b2d9c2fe51bfaec29fb96a7d9d612b35e69 100644 (file)
--- a/include/combat.h
+++ b/include/combat.h
@@ -34,8 +34,8 @@
 #ifndef COMBAT_H
 #define COMBAT_H
 
-#include "sect.h"
-#include "queue.h"
+#include "types.h"
+#include "ship.h"
 
 struct combat {
     int type;                  /* EF_BAD, EF_SECTOR, EF_SHIP, or EF_PLANE */
@@ -56,7 +56,7 @@ struct combat {
     struct dchrstr *sct_dcp;
     struct mchrstr *shp_mcp;
     struct lchrstr *lnd_lcp;
-    char shp_name[MAXSHPNAMLEN];
+    char shp_name[MAXSHPNAMLEN]; /* FIXME huh? pulls in ship.h */
     int relations_checked;
 };
 

diff --git a/include/commands.h b/include/commands.h
index 933a71ff5c8555698c28746e18f56d3c78993454..34cf7951ca5f12e20e887440eb102bc318f083cb 100644 (file)
--- a/include/commands.h
+++ b/include/commands.h
@@ -34,27 +34,10 @@
 #ifndef COMMANDS_H
 #define COMMANDS_H
 
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-#include "misc.h"
-#include "plane.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
-#include "nsc.h"
+#include "file.h"
 #include "nat.h"
-#include "queue.h"
-#include "subs.h"
-#include "gen.h"
-#include "common.h"
-#include "lost.h"
-#include "map.h"
-#include "update.h"
-
-#include "prototypes.h"                /* must come at end, after defines and typedefs */
+#include "player.h"
+#include "sect.h"
+#include "prototypes.h"
 
 #endif

diff --git a/include/commodity.h b/include/commodity.h
index 5ae2d2bff754109b15220f05d85472c3883681dd..5062f216c84a321402328add4d5218e843a173f0 100644 (file)
--- a/include/commodity.h
+++ b/include/commodity.h
@@ -36,6 +36,9 @@
 #ifndef COMMODITY_H
 #define COMMODITY_H
 
+#include "types.h"
+#include "item.h"
+
 struct comstr {
     short ef_type;
     natid com_owner;

diff --git a/include/common.h b/include/common.h
deleted file mode 100644 (file)
index d4d42f5..0000000
--- a/include/common.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  common.h: Includes for common stuff
- * 
- *  Known contributors to this file:
- *  
- */
-
-#ifndef COMMON_H
-#define COMMON_H
-
-#include <stdio.h>             /* FILE */
-#include "misc.h"
-#include "sect.h"              /* struct sctstr */
-#include "ship.h"              /* struct shpstr */
-#include "land.h"              /* struct lndstr */
-#include "plane.h"             /* struct plnstr */
-#include "nuke.h"              /* struct nchrstr */
-#include "nsc.h"               /* struct castr struct nstr_sect struct nstr_item */
-#include "xy.h"                        /* struct range */
-#include "prototypes.h"                /* must come at end, after defines and typedefs */
-
-#endif

diff --git a/include/empobj.h b/include/empobj.h
index cc800fd5b386298396cb3a326960b344facec1c1..546ef46bde8b803206f9ed8bda1253f88c0a18ce 100644 (file)
--- a/include/empobj.h
+++ b/include/empobj.h
@@ -35,21 +35,19 @@
 #ifndef EMPOBJ_H
 #define EMPOBJ_H
 
-#include "config.h"
-#include "file.h"
-#include "nat.h"
 #include "commodity.h"
 #include "land.h"
 #include "loan.h"
 #include "lost.h"
-#include "plane.h"
+#include "nat.h"
 #include "news.h"
 #include "nuke.h"
+#include "plane.h"
 #include "sect.h"
 #include "ship.h"
 #include "trade.h"
 #include "treaty.h"
-#include "prototypes.h"
+#include "types.h"
 
 struct empobj {
     short ef_type;     /* is always valid */

diff --git a/include/empthread.h b/include/empthread.h
index c86b1feb711a8bb6061418358ef41cca3212f164..c03091b0e23b6b3d4ab8ef85328397a8bbc2c834 100644 (file)
--- a/include/empthread.h
+++ b/include/empthread.h
@@ -49,6 +49,8 @@
 #ifndef EMPTHREAD_H
 #define EMPTHREAD_H
 
+#include <time.h>
+
 /* thread priorities */
 enum {
     PP_MAIN     = 7,

diff --git a/include/file.h b/include/file.h
index fa16f7cf823bb3d4b2cbe7186a72f8cd1229c698..2e7c0cbb33073e6acc9622bdb1cafe12ba8c1799 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -34,7 +34,6 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include <stddef.h>
 #include <time.h>
 
 struct empfile {

diff --git a/include/gen.h b/include/gen.h
deleted file mode 100644 (file)
index e8d2ede..0000000
--- a/include/gen.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  gen.h: Includes for generic stuff
- * 
- *  Known contributors to this file:
- * 
- */
-
-#ifndef GEN_H
-#define GEN_H
-
-#include <stdlib.h>            /* atoi etc. */
-#include "misc.h"
-#include "xy.h"                        /* struct range */
-#include "prototypes.h"                /* must come at end, after defines and typedefs */
-
-#endif

diff --git a/include/ioqueue.h b/include/ioqueue.h
index 515db71aeb473f737a6e94e2ac4926a8d048fc0d..0e6fe15d665b75e4fc7dc3a34a17070487e3084d 100644 (file)
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -34,6 +34,11 @@
 #ifndef IOQUEUE_H
 #define IOQUEUE_H
 
+#ifndef _WIN32
+#include <sys/uio.h>
+#endif
+#include "queue.h"
+
 struct io {
     struct emp_qelem queue;
     int size;

diff --git a/include/land.h b/include/land.h
index 95b161042d43cf63a429220df793c01c40202b66..e94fb040b4630d0b63c8462c0bf751770ff2923a 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -36,11 +36,10 @@
 #ifndef LAND_H
 #define LAND_H
 
-#include "sect.h"
-#include "ship.h"
+#include "item.h"
 #include "queue.h"
-#include "nsc.h"
 #include "retreat.h"
+#include "types.h"
 
 #define LND_TYPE_MAX   30
 #define LAND_MINEFF    10

diff --git a/include/loan.h b/include/loan.h
index 79f2df5e349e8a83cf39e0b3a80f09f3e2fe1469..9788d528dec49734f0a82f57b87d242f6bc6fbc8 100644 (file)
--- a/include/loan.h
+++ b/include/loan.h
@@ -34,6 +34,9 @@
 #ifndef LOAN_H
 #define LOAN_H
 
+#include <time.h>
+#include "types.h"
+
 #define        MAXLOAN         100000
 #define SECS_PER_DAY   (60*60*24)
 

diff --git a/include/lost.h b/include/lost.h
index 2572dce220800b6dad75ea37116df045947b11b2..9f02b7075d9ef893ad00780bab3d97de9c0e5008 100644 (file)
--- a/include/lost.h
+++ b/include/lost.h
@@ -34,6 +34,9 @@
 #ifndef LOST_H
 #define LOST_H
 
+#include <time.h>
+#include "types.h"
+
 struct loststr {
     /* initial part must match struct empobj */
     short ef_type;

diff --git a/include/lwp.h b/include/lwp.h
index 630e263103fa25bbab51840adeff4ee9c8bd3fb3..ec053be351e3d06f87e76353da0a20e567510848 100644 (file)
--- a/include/lwp.h
+++ b/include/lwp.h
@@ -25,7 +25,6 @@
 #define LWP_H
 
 #include <signal.h>
-#include "misc.h"
 
 #define LWP_STACKCHECK 0x1
 #define LWP_PRINT      0x2

diff --git a/include/map.h b/include/map.h
index 0a61c64d08ff73a020655815a2b9d4164ea8ad2e..f8d703b3496211ddc284a522700e05b69564cc17 100644 (file)
--- a/include/map.h
+++ b/include/map.h
@@ -34,8 +34,7 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "misc.h"
-#include "xy.h"
+#include "types.h"
 
 #define        MAPWIDTH(persec) ((WORLD_X/2) * ((persec) + 1) + 1)
 

diff --git a/include/misc.h b/include/misc.h
index ecff7ea4fdf35a7c6f668a4d7d2924febe3ec600..dc666f81347e8d69246d301f15c76dd046b17e0e 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -35,9 +35,7 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include <ctype.h>
-#include <string.h>
-#include <sys/types.h>
+#include <time.h>
 
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -88,10 +86,6 @@ struct mob_acc_globals {
 #define RESOLVE_IPADDRESS      /* resolve ip addresses into hostnames */
 #endif
 
-typedef unsigned char natid;   /* NSC_NATID must match this */
-
-typedef short coord;
-
 #ifndef bit
 #define        bit(x)          (1<<(x))
 #endif
@@ -134,7 +128,4 @@ extern char *prbuf(char *format, ...)
 #define AGREE_PROPOSED 1
 #define AGREE_SIGNED   2
 
-struct empobj;
-union empobj_storage;
-
 #endif

diff --git a/include/nat.h b/include/nat.h
index 4edddd83a761bcec97b03935f098226c86c7cc4e..6a66131e3de3a8038f3849d356f9493533f3e309 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -36,7 +36,8 @@
 #ifndef NAT_H
 #define NAT_H
 
-#include "sect.h"
+#include <time.h>
+#include "types.h"
 
 #define        MAXNOR          50      /* max # realms */
 

diff --git a/include/nsc.h b/include/nsc.h
index dcecec1fef7a831b001a02667e2248aa4f91eaf5..4c6b8502f6a2bf889636151fe43e8851f70db35b 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -36,6 +36,7 @@
 #define NSC_H
 
 #include <stddef.h>
+#include "misc.h"
 #include "xy.h"
 
 #define NS_LSIZE       128

diff --git a/include/nuke.h b/include/nuke.h
index a64cedaeacdc0a83a2e4203125e66ae6b3e6829c..8960471ff8ea5775dd5e824ac8dc6ea1ca673eb1 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -34,6 +34,9 @@
 #ifndef NUKE_H
 #define NUKE_H
 
+#include <time.h>
+#include "types.h"
+
 #define        N_MAXNUKE       20
 #define        MIN_DRNUKE_CONST        0.001
 

diff --git a/include/path.h b/include/path.h
index 57db9399626c629fa930677d77e4f1ded29cc08a..48312eaa3798109a0abe46119f784a77b8bbc5d2 100644 (file)
--- a/include/path.h
+++ b/include/path.h
@@ -34,9 +34,7 @@
 #ifndef PATH_H
 #define PATH_H
 
-#include "misc.h"
-#include "sect.h"
-#include "xy.h"
+#include "types.h"
 
        /* direction indices */
 #define        DIR_STOP        0

diff --git a/include/plane.h b/include/plane.h
index beee78d6ed6849bb1fc83ec6a72d043cce6f1efb..1beeebeea5719df08461189dd14631ca98172d81 100644 (file)
--- a/include/plane.h
+++ b/include/plane.h
@@ -36,8 +36,9 @@
 #ifndef PLANE_H
 #define PLANE_H
 
+#include <time.h>
 #include "queue.h"
-#include "sect.h"
+#include "types.h"
 
 #define PLN_TYPE_MAX   46
 #define        PLANE_MINEFF    10

diff --git a/include/player.h b/include/player.h
index 6415e90f0508d679089c3b2bbb9a72a2f607c369..0407169d99f49cb3f553b906d7fc2b3154a75e22 100644 (file)
--- a/include/player.h
+++ b/include/player.h
@@ -35,14 +35,11 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include <sys/types.h>
-#if !defined(_WIN32)
-#include <netinet/in.h>
-#endif
-#include "queue.h"
-#include "misc.h"
-#include "com.h"
+#include <time.h>
 #include "empthread.h"
+#include "misc.h"
+#include "queue.h"
+#include "types.h"
 
 struct player {
     struct emp_qelem queue;

diff --git a/include/power.h b/include/power.h
index f369b87c402872fe60c2416fe836d00905fcaf55..b99ff19bcf0c9b8a86244eb6f129e340f14c0801 100644 (file)
--- a/include/power.h
+++ b/include/power.h
@@ -34,6 +34,8 @@
 #ifndef POWER_H
 #define POWER_H
 
+#include "types.h"
+
 struct powstr {
     natid p_nation;
     float p_sects;

diff --git a/include/prototypes.h b/include/prototypes.h
index a8dde780ababb3979dfc016373940573d0aba9fd..0ff66342e376ae2499a7bcde1412e39f804ec167 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -36,13 +36,12 @@
 #define PROTOTYPES_H
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "item.h"
+#include "nsc.h"
 #include "misc.h"
-#include "empthread.h"
-#include "player.h"
-#include "commands.h"
-#include "product.h"
-#include "empio.h"
-#include "commodity.h"
+#include "types.h"
 
 /* src/server/main.c */
 extern void shutdwn(int sig);

diff --git a/include/sect.h b/include/sect.h
index ce3c5a0315e15589179996955c011b4982e5d1f9..ba4078a1348642c483461fe9f35c2b527148462a 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -38,6 +38,7 @@
 #define SECT_H
 
 #include "item.h"
+#include "types.h"
 
 struct sctstr {
     /* initial part must match struct empobj */

diff --git a/include/server.h b/include/server.h
index 4b24792005104770dc5566143ed72ff9877ee7a8..7d504a051db3e78c10883685723c881cf1f36e4a 100644 (file)
--- a/include/server.h
+++ b/include/server.h
@@ -34,6 +34,8 @@
 #ifndef SERVER_H
 #define SERVER_H
 
+#include "empthread.h"
+
 extern int shutdown_pending;
 extern int update_pending;
 extern empth_sem_t *update_sem;

diff --git a/include/ship.h b/include/ship.h
index e58cd0d0221f4a6f69a3b62b40d89d5d46da5a6d..c93b3339b5d388a5d2dbd65ef09cc79db2292e4e 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -39,8 +39,8 @@
 
 #include "item.h"
 #include "queue.h"
-#include "misc.h"
 #include "retreat.h"
+#include "types.h"
 
 #define SHP_TYPE_MAX   46
 #define        SHIP_MINEFF     20

diff --git a/include/subs.h b/include/subs.h
deleted file mode 100644 (file)
index 384fa69..0000000
--- a/include/subs.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  subs.h: Headers for things having to do with subs.
- * 
- *  Known contributors to this file:
- *     
- */
-
-#ifndef SUBS_H
-#define SUBS_H
-
-#include "misc.h"
-#include "sect.h"
-#include "plane.h"
-#include "loan.h"
-#include "treaty.h"
-#include "nsc.h"
-#include "land.h"
-#include "com.h"
-#include "nuke.h"
-#include "item.h"
-#include "ship.h"
-#include "queue.h"
-#include "xy.h"
-#include "empobj.h"
-#include "trade.h"
-#include "player.h"
-#include "prototypes.h"                /* must come at end, after defines and typedefs */
-
-#endif

diff --git a/include/tel.h b/include/tel.h
index 130210d8d95c3223420355ce80aa60a3576dddb3..dcc70190d51cceb41f1403fb9e49241902a936a1 100644 (file)
--- a/include/tel.h
+++ b/include/tel.h
@@ -34,6 +34,9 @@
 #ifndef TEL_H
 #define TEL_H
 
+#include <time.h>
+#include "types.h"
+
 #define        MAXTELSIZE      1024    /* doesn't apply to TEL_UPDATE */
 
 #define TEL_NORM       0       /* normal */

diff --git a/include/trade.h b/include/trade.h
index fc3d7cf013622e67c87f37767ec7ae8f4ceeaaf5..368af9730787e70b85049da69b2973cc7c6ea74a 100644 (file)
--- a/include/trade.h
+++ b/include/trade.h
@@ -37,6 +37,9 @@
 #ifndef TRADE_H
 #define TRADE_H
 
+#include <time.h>
+#include "types.h"
+
 struct trdstr {
     short ef_type;
     natid trd_owner;

diff --git a/include/treaty.h b/include/treaty.h
index 7d00ab17fa6d8e9802931cf0d84cc68d9c8b43db..514bb9f5f3c1eb749f810d213308e06588978caf 100644 (file)
--- a/include/treaty.h
+++ b/include/treaty.h
@@ -34,6 +34,9 @@
 #ifndef TREATY_H
 #define TREATY_H
 
+#include <time.h>
+#include "types.h"
+
 struct trtstr {
     short ef_type;
     natid trt_cna;             /* proposer */

diff --git a/include/types.h b/include/types.h
new file mode 100644 (file)
index 0000000..de6e6c7
--- /dev/null
+++ b/include/types.h
@@ -0,0 +1,63 @@
+/*
+ *  Empire - A multi-player, client/server Internet based war game.
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                           Ken Stevens, Steve McClure
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  ---
+ *
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
+ *
+ *  ---
+ *
+ *  types.h: Empire types
+ * 
+ *  Known contributors to this file:
+ *     Markus Armbruster, 2006
+ */
+
+#ifndef TYPES_H
+#define TYPES_H
+
+typedef unsigned char natid;   /* NSC_NATID must match this */
+typedef short coord;
+
+struct emp_qelem;
+struct empobj;
+struct lndstr;
+struct lndstr;
+struct lonstr;
+struct natstr;
+struct nchrstr;
+struct nstr_item;
+struct nstr_sect;
+struct nukstr;
+struct plist;
+struct plnstr;
+struct range;
+struct sctstr;
+struct shiplist;
+struct shpstr;
+struct trdstr;
+struct trtstr;
+struct comstr;
+struct cmndstr;
+
+union empobj_storage;
+
+#endif

diff --git a/include/update.h b/include/update.h
index 7f8f4befb33536dcd68137fa90fea2544020d220..1c598ec11ea3058f66eab6bc85f6545da760b181 100644 (file)
--- a/include/update.h
+++ b/include/update.h
@@ -34,16 +34,10 @@
 #ifndef UPDATE_H
 #define UPDATE_H
 
-#include "misc.h"
-#include "queue.h"
-#include "sect.h"
-#include "item.h"
-#include "land.h"
-#include "plane.h"
-#include "ship.h"
+#include "file.h"
 #include "nat.h"
-#include "nsc.h"
-#include "product.h"
-#include "prototypes.h"                /* must come at end, after defines and typedefs */
+#include "optlist.h"
+#include "prototypes.h"
+#include "sect.h"
 
 #endif

diff --git a/include/xy.h b/include/xy.h
index 5cf59dbc65918ebe43379c5af2887aa824fe0b82..1c614a1cc0e68f71d5cc16bbd530813771cbd496 100644 (file)
--- a/include/xy.h
+++ b/include/xy.h
@@ -34,8 +34,7 @@
 #ifndef XY_H
 #define XY_H
 
-#include "sect.h"
-#include "nat.h"
+#include "types.h"
 
 /* Used to calculate an offset into an array.  Used for
    dynamically sizing the world. */

diff --git a/src/client/expect.c b/src/client/expect.c
index b25107fbb5e8cdc729052c52a32b0cb1137c9c81..7e1ba8fb7d7288e83917ed4838acf6602b5174fa 100644 (file)
--- a/src/client/expect.c
+++ b/src/client/expect.c
@@ -33,16 +33,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
-#include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <unistd.h>
 #endif
+#include "misc.h"
 
 int
 recvline(int s, char *buf)

diff --git a/src/client/host.c b/src/client/host.c
index 7b5b077fbe2ad83385ed5082e461c27bf9b300cc..4eff2d8aa10edfd7789b6e3cdbfc177f495c5056 100644 (file)
--- a/src/client/host.c
+++ b/src/client/host.c
@@ -40,12 +40,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #ifndef _WIN32
 #include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #else
 #include <io.h>

diff --git a/src/client/ioqueue.c b/src/client/ioqueue.c
index 4af9791028cfa53880be120ea9f7e63e4ecdccab..4f271239efbd795ac8f3b92bdd3d937d48d7cdda 100644 (file)
--- a/src/client/ioqueue.c
+++ b/src/client/ioqueue.c
@@ -36,10 +36,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
+#include "ioqueue.h"
 #include "misc.h"
 #include "queue.h"
-#include "ioqueue.h"
 
 static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);
 static void enqueuecc(struct ioqueue *ioq, char *buf, int cc);

diff --git a/src/client/ioqueue.h b/src/client/ioqueue.h
index c8565b0b998a0afd617d63bb6bfefc1b9a11e509..732db48a9abd6f0817138c547e785de8df484193 100644 (file)
--- a/src/client/ioqueue.h
+++ b/src/client/ioqueue.h
@@ -35,6 +35,8 @@
 #ifndef IOQUEUE_H
 #define IOQUEUE_H
 
+#include "queue.h"
+
 struct ioqueue {
     struct qelem queue;                /* queue fwd/back */
     int bsize;                 /* basic block size */

diff --git a/src/client/login.c b/src/client/login.c
index e6bc0090d9af340971909fc6e12ccc586ffbb5b3..c3f8e59a7f6236334ea63a38f6211389658b2518 100644 (file)
--- a/src/client/login.c
+++ b/src/client/login.c
@@ -34,9 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "proto.h"
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,6 +41,8 @@
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
+#include "misc.h"
+#include "proto.h"
 
 int
 login(int s, char *uname, char *cname, char *cpass,

diff --git a/src/client/main.c b/src/client/main.c
index d0e00b83d52f653a4287b84f17b888123bdd1807..fce9886cbc8b604949ee669aa0102f30423de73e 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -36,32 +36,25 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "proto.h"
-#include "queue.h"
-#include "ioqueue.h"
-#include "tags.h"
-
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#ifndef _WIN32
-#include <pwd.h>
-#endif
-#include <signal.h>
-#include <errno.h>
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#else
+#ifdef _WIN32
 #include <windows.h>
 #include <conio.h>
 #include <io.h>
+#else
+#include <pwd.h>
+#include <unistd.h>
 #endif
 
+#include "ioqueue.h"
+#include "misc.h"
+#include "proto.h"
+#include "tags.h"
+
 #ifdef _WIN32
 HANDLE hStdIn;
 #endif

diff --git a/src/client/misc.h b/src/client/misc.h
index 3057b1016e2a3ebd4837f2b470c530ba540642ef..292e8e8808ec601d7ba84b6c9f8d204d606e7a68 100644 (file)
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -34,13 +34,9 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include <ctype.h>
 #include <stdio.h>
-#include <sys/types.h>
 #ifdef _WIN32
 #include <windows.h>
-#else
-#include <netinet/in.h>
 #endif
 
 struct ioqueue;

diff --git a/src/client/queue.c b/src/client/queue.c
index ece88034b77b11e17fd55265ecd1efdf44d99dd5..0187c489c2e066749f1fbda52411fb2f00793b60 100644 (file)
--- a/src/client/queue.c
+++ b/src/client/queue.c
@@ -33,11 +33,6 @@
 
 #include <config.h>
 
-#include <stdlib.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-#include "misc.h"
 #include "queue.h"
 
 void

diff --git a/src/client/servcmd.c b/src/client/servcmd.c
index fbf3fb9adca711eceabfb0244c77d64d8dd33e50..18814c6c6c3bebb54cb303a41cc352a1afa34dfc 100644 (file)
--- a/src/client/servcmd.c
+++ b/src/client/servcmd.c
@@ -35,23 +35,22 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "proto.h"
-#include "queue.h"
-#include "ioqueue.h"
-#include "tags.h"
-
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#else
+#ifdef _WIN32
 #include <io.h>
+#else
+#include <unistd.h>
 #endif
 
+#include "ioqueue.h"
+#include "misc.h"
+#include "proto.h"
+#include "tags.h"
+
 static char num_teles[64];
 static char the_prompt[1024];
 static int mode;

diff --git a/src/client/serverio.c b/src/client/serverio.c
index 93420c5baa1c9587b970ac0f91ff71dc8b0ec0ae..7861e8c2ffb8aefc55ed0d79fde63bb89c4c016e 100644 (file)
--- a/src/client/serverio.c
+++ b/src/client/serverio.c
@@ -33,19 +33,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "queue.h"
-#include "ioqueue.h"
-
 #include <stdio.h>
 #include <stdlib.h>
-
-#if !defined(_WIN32)
-#include <unistd.h>
-#else
+#ifdef _WIN32
 #include <io.h>
+#else
+#include <unistd.h>
 #endif
-
+#include "misc.h"
+#include "ioqueue.h"
 
 int
 serverio(int s, struct ioqueue *ioq)

diff --git a/src/client/tags.c b/src/client/tags.c
index e6a2d720cc2a4a6704da3bfb5c542c4066d214a5..244abf0a73db61d7ae6bf628cdb9f303a308fde6 100644 (file)
--- a/src/client/tags.c
+++ b/src/client/tags.c
@@ -34,15 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "tags.h"
-
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
+#include "misc.h"
+#include "tags.h"
 
 struct tagstruct *taglist;
 

diff --git a/src/client/termio.c b/src/client/termio.c
index 12c3190b07636e3c7cfafd8adf203251b10c256b..302fcf554b3ef14e328745eb5dd2f8a3ce16a75d 100644 (file)
--- a/src/client/termio.c
+++ b/src/client/termio.c
@@ -33,15 +33,15 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#ifndef _WIN32
-#include <unistd.h>
-#else
+#ifdef _WIN32
 #include <io.h>
-#endif /* _WIN32 */
+#else
+#include <unistd.h>
+#endif
 #include "misc.h"
 #include "tags.h"
 

diff --git a/src/lib/as/as.h b/src/lib/as/as.h
index 98be3e30d5a2e9f13a475b42a98d88d51cef9b0e..1399106ccefc24731f92e69f310068b7f3f6ce81 100644 (file)
--- a/src/lib/as/as.h
+++ b/src/lib/as/as.h
@@ -31,7 +31,7 @@
 #define AS_H
 
 #include <stdio.h>
-#include "misc.h"
+#include "types.h"
 
 /*
  * Coordinate.

diff --git a/src/lib/as/as_cache.c b/src/lib/as/as_cache.c
index 1d15c5f9c551b7cafac486cfc44bfc0b87c0e12c..d66318d455f284dca37b45fba8ef876d4a66b1dd 100644 (file)
--- a/src/lib/as/as_cache.c
+++ b/src/lib/as/as_cache.c
@@ -34,6 +34,7 @@
 #include <config.h>
 
 #include <stdlib.h>
+#include <string.h>
 #include "as.h"
 #include "optlist.h"
 

diff --git a/src/lib/as/as_delete.c b/src/lib/as/as_delete.c
index 4041c7fd42c547d3ed318160b3b688cab2e05122..eab8b4be043f65951bbdaf3ec6dff7c77dec5eb3 100644 (file)
--- a/src/lib/as/as_delete.c
+++ b/src/lib/as/as_delete.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/as/as_extend.c b/src/lib/as/as_extend.c
index 754705ff412c27afc897c69fb9e2f8e667d025c4..4c9e7e3a6650e847863f8588704cec371acb0b32 100644 (file)
--- a/src/lib/as/as_extend.c
+++ b/src/lib/as/as_extend.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/as/as_hash.c b/src/lib/as/as_hash.c
index ba34bc0c5e9f0820e7b917f29c51e0dc83e233db..c211befca9a311453ccd0b75acd30ab6410cb7c9 100644 (file)
--- a/src/lib/as/as_hash.c
+++ b/src/lib/as/as_hash.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/as/as_init.c b/src/lib/as/as_init.c
index c02f26e2d4bcc6e06b037beaa4713a6831a54748..105140854756370c158ab03223692e21e18d7df8 100644 (file)
--- a/src/lib/as/as_init.c
+++ b/src/lib/as/as_init.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/as/as_merge.c b/src/lib/as/as_merge.c
index e19176fa45cfe080902b8bf14afbd1ef18b6d6cb..ccd7b799a6be8b90984fe25e01862d8da93a4f12 100644 (file)
--- a/src/lib/as/as_merge.c
+++ b/src/lib/as/as_merge.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/as/as_search.c b/src/lib/as/as_search.c
index 8c812dc0184911104a0830f73ce90a67c9af00fd..58606a23640ae851ca8d23d1ec892e827d344a0a 100644 (file)
--- a/src/lib/as/as_search.c
+++ b/src/lib/as/as_search.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/as/as_stats.c b/src/lib/as/as_stats.c
index 1fdaeecdc768d6e67d1b12fe43cdf23bb67c8015..cadc8dc4da438796ef48f4b99ff3fa7a245753d9 100644 (file)
--- a/src/lib/as/as_stats.c
+++ b/src/lib/as/as_stats.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include "as.h"
 
 /*

diff --git a/src/lib/as/as_winnow.c b/src/lib/as/as_winnow.c
index 9ade2e1c806fc0bb8db49872d04264ca45b879cd..339b85dc938b6ce155e2a61fd117f3fd4de99d05 100644 (file)
--- a/src/lib/as/as_winnow.c
+++ b/src/lib/as/as_winnow.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index e9b85d81f1772fa4c84ef7ac59a305de26d6d678..14dd6d108a93e34faee7942a7ffe07fd111bb848 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -33,11 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index f770005eedd7638179f1cba5ac44d9d1efef8a40..140a0901a159b95d5ad19578040e622d5664ac63 100644 (file)
--- a/src/lib/commands/add.c
+++ b/src/lib/commands/add.c
@@ -33,20 +33,12 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "tel.h"
-#include "land.h"
+#include <fcntl.h>
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "plague.h"
+#include "tel.h"
 
 int
 add(void)

diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index 7954ddbba7f12469fb88baaba286e15e841842f7..da88c1c4b3a368d130c1d6c2ad9e11c93800d0c0 100644 (file)
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.c
@@ -34,17 +34,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
+#include "lost.h"
 #include "optlist.h"
 
 /*

diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index 7f3320639e49edbf7f7f81db6d6e46be7050cb06..8093f1e55f4301f6e58e56fcb647a24867a45d7c 100644 (file)
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -36,16 +36,10 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
 #include "optlist.h"
+#include "plane.h"
 
 int
 arm(void)

diff --git a/src/lib/commands/army.c b/src/lib/commands/army.c
index d17c7839d33f4f349511ed7c524dc71b902d979b..2cd47652d532ed6351070026554ba0a66b869bc6 100644 (file)
--- a/src/lib/commands/army.c
+++ b/src/lib/commands/army.c
@@ -34,12 +34,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 
 int
 army(void)

diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c
index 4e7d35f77a72b2cf2c03d7ac4fabe2bf075d776b..40c82c77ed048c96ba55462b6f6d7083d2424c29 100644 (file)
--- a/src/lib/commands/assa.c
+++ b/src/lib/commands/assa.c
@@ -34,18 +34,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
+#include "combat.h"
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
 #include "mission.h"
+#include "path.h"
 #include "ship.h"
-#include "combat.h"
-#include "commands.h"
 
 int
 assa(void)

diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c
index c38e3f59bbb41c88a0f9070814f0752ef24f5347..4e6a4e244e704679f4d4dbf4cb4f4c33c9d81766 100644 (file)
--- a/src/lib/commands/atta.c
+++ b/src/lib/commands/atta.c
@@ -35,19 +35,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
+#include "combat.h"
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
 #include "mission.h"
+#include "path.h"
 #include "ship.h"
-#include "combat.h"
-#include "commands.h"
 
 int
 atta(void)

diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c
index 20186424a686e4aa0e6c7f121669183c0d0dbc35..04e76722b3d59beaa7a139815ba3984e8cc6535c 100644 (file)
--- a/src/lib/commands/bdes.c
+++ b/src/lib/commands/bdes.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
+#include <ctype.h>
 #include "commands.h"
+#include "map.h"
+#include "path.h"
 
 int
 bdes(void)

diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c
index a2a32b26a1066577f368bf4a28ad577205cc3791..366742b798c29c1ba4ae62221efaef910a17a38a 100644 (file)
--- a/src/lib/commands/best.c
+++ b/src/lib/commands/best.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "path.h"
 
 int
 best(void)

diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c
index 4ba1f3aacbd3715f5b705db02c4a456ebb6728d5..d29e9c25cf4a9681c4537d8dcc5f4dd113b54540 100644 (file)
--- a/src/lib/commands/boar.c
+++ b/src/lib/commands/boar.c
@@ -33,20 +33,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
+#include "combat.h"
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
 #include "mission.h"
-#include "ship.h"
-#include "combat.h"
+#include "path.h"
 #include "retreat.h"
-#include "commands.h"
+#include "ship.h"
 
 int
 boar(void)

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index 62257ec379e36e6954db644fcb4a278bd7e5c9ae..806f30c755003d3cc8caa6ee2be17af226e941eb 100644 (file)
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -36,24 +36,16 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
+#include "commands.h"
+#include "damage.h"
 #include "item.h"
-#include "plane.h"
-#include "retreat.h"
-#include "xy.h"
-#include "nsc.h"
+#include "land.h"
 #include "news.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #include "optlist.h"
-#include "damage.h"
-#include "commands.h"
+#include "path.h"
+#include "plane.h"
+#include "retreat.h"
+#include "ship.h"
 
 static void pin_bomb(struct emp_qelem *list, struct sctstr *target);
 static void strat_bomb(struct emp_qelem *list, struct sctstr *target);

diff --git a/src/lib/commands/brea.c b/src/lib/commands/brea.c
index 9b3dee2a9b8353c6ed597e227995fceac6582adc..9a9e924ca1242678db485b1c4136411b1b886afd 100644 (file)
--- a/src/lib/commands/brea.c
+++ b/src/lib/commands/brea.c
@@ -33,10 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index ecd85f3a2a5397755c56e7d01383642712fa5650..907d558d4d8589add1bd69a3d5bcbf75c83002cf 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -36,22 +36,15 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
+#include <ctype.h>
+#include "budg.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
-#include "ship.h"
 #include "land.h"
-#include "plane.h"
 #include "optlist.h"
-#include "budg.h"
-#include "commands.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/buil.c b/src/lib/commands/buil.c
index 9d1c0ede60cc9b641e55b735f441f936fe655e04..c75f0a2e18efaa12bccd7912b048ca99fefe2c48 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -35,23 +35,17 @@
 #include <config.h>
 
 #include <limits.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
+#include "commands.h"
 #include "land.h"
+#include "lost.h"
+#include "map.h"
 #include "nuke.h"
+#include "optlist.h"
+#include "path.h"
+#include "plague.h"
 #include "plane.h"
-#include "xy.h"
-#include "nsc.h"
+#include "ship.h"
 #include "treaty.h"
-#include "file.h"
-#include "path.h"
-#include "optlist.h"
-#include "commands.h"
 
 static int build_nuke(struct sctstr *sp,
                      struct nchrstr *np, short *vec, int tlev);

diff --git a/src/lib/commands/buy.c b/src/lib/commands/buy.c
index 2188239b8879900d47c00e86ade93ddc562d9fe6..c77d20c6f99d6595baff5cd9e63fb63582726d6c 100644 (file)
--- a/src/lib/commands/buy.c
+++ b/src/lib/commands/buy.c
@@ -35,23 +35,16 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "file.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
+#include "commands.h"
+#include "commodity.h"
 #include "item.h"
 #include "land.h"
-#include "commodity.h"
+#include "loan.h"
+#include "news.h"
+#include "optlist.h"
 #include "plane.h"
 #include "ship.h"
 #include "trade.h"
-#include "player.h"
-#include "loan.h"
-#include "commands.h"
-#include "optlist.h"
 
 /*
  * format: buy <COMMODITY>

diff --git a/src/lib/commands/capi.c b/src/lib/commands/capi.c
index 78cfbe30a4fce3f23c438d496ff4847556880d97..ccfa9c8e5e5cb7be78f4b32defcf4d82eba21e27 100644 (file)
--- a/src/lib/commands/capi.c
+++ b/src/lib/commands/capi.c
@@ -34,13 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index ce2d0bd13ed46e2dfebb2596c56857273094f993..ebe3efea79959f2daaf79c28e3f031f6024713f8 100644 (file)
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.c
@@ -33,15 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 carg(void)

diff --git a/src/lib/commands/cede.c b/src/lib/commands/cede.c
index 87f8845840f659599e3506025b516ddf8a3ac013..53e16e8bd36e37d71330d3beeae8b427ebd6f636 100644 (file)
--- a/src/lib/commands/cede.c
+++ b/src/lib/commands/cede.c
@@ -34,19 +34,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
+#include "commands.h"
+#include "land.h"
+#include "lost.h"
+#include "nuke.h"
 #include "path.h"
-#include "file.h"
 #include "plane.h"
-#include "land.h"
 #include "ship.h"
-#include "nuke.h"
-#include "commands.h"
 
 static void cede_hdr(void);
 static int cede_sect(struct nstr_sect *, natid);

diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c
index 5366f6cc2907d784b270dafe4b00b8e7ce17025b..c71660ef64e4039c04c2cf1ddaee76eb11b99b24 100644 (file)
--- a/src/lib/commands/cens.c
+++ b/src/lib/commands/cens.c
@@ -33,10 +33,9 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
 static void cens_hdr(void);
 

diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c
index f1eb26c9b6c79c496fcd53710783db404f5e4e2d..f19607d7a6d70d5b427ee794884f318d34a9e090 100644 (file)
--- a/src/lib/commands/chan.c
+++ b/src/lib/commands/chan.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
+#include "commands.h"
 #include "news.h"
 #include "optlist.h"
-#include "commands.h"
+#include <ctype.h>
 
 int
 chan(void)

diff --git a/src/lib/commands/coas.c b/src/lib/commands/coas.c
index 28324317007c2b9422f2036cbfe2e91de39658c7..c36c7a796dc140e3fd04c61a64603a119f7db2a2 100644 (file)
--- a/src/lib/commands/coas.c
+++ b/src/lib/commands/coas.c
@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 #define        TSIZE   200
 

diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index e6439d762a7ee37f56c74c14f550cbae53cbde9c..737c584e524e4c1c9be0bec2422d13d3d50f1923 100644 (file)
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -34,16 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
 #include "loan.h"
+#include "lost.h"
 #include "news.h"
-#include "nat.h"
-#include "xy.h"
-#include "commands.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index 762994c36a039459c09eac5ca420ed82fbf3c716..14d112825a606872445a8fb1cb65a3bcb709f659 100644 (file)
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
-#include "nat.h"
 #include "commands.h"
+#include "path.h"
 
 static void prthresh(int val);
 

diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c
index 7ed3ae73557f33bd50faa026c8482ec5b8a19e34..f9c08d15da036117a62c110d4219b2b7bcf80767 100644 (file)
--- a/src/lib/commands/cons.c
+++ b/src/lib/commands/cons.c
@@ -33,17 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
+#include "commands.h"
 #include "loan.h"
-#include "nat.h"
-#include "treaty.h"
 #include "news.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "commands.h"
 #include "optlist.h"
+#include "treaty.h"
 
 /*
  * Things common to a loan or treaty.

diff --git a/src/lib/commands/conv.c b/src/lib/commands/conv.c
index 4c340422fb2ee902ab91f64a94066622d8f32c33..66257fcddab685170afd441ba1bceb70a6ce0821 100644 (file)
--- a/src/lib/commands/conv.c
+++ b/src/lib/commands/conv.c
@@ -37,15 +37,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "land.h"
 #include "commands.h"
+#include "land.h"
 
 static long do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real);
 

diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c
index c9c7154d3e18177ceadf9a7b342494c2ef05ab2b..4022bb39e550073a82ee9168be69c520c7952a8a 100644 (file)
--- a/src/lib/commands/coun.c
+++ b/src/lib/commands/coun.c
@@ -33,15 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include <fcntl.h>
-#include <ctype.h>
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c
index 1d74fbba089041efe569c1ea6b04162a4e71e028..94fbd534afdedd62b1857f39d8a6fdc3efc61a33 100644 (file)
--- a/src/lib/commands/cuto.c
+++ b/src/lib/commands/cuto.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "path.h"
 
 int
 cuto(void)

diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index 266603b739373d87902d246a564e40e15e02cf36..20e1e085e4ce5d1067e714e059c6d10941533216 100644 (file)
--- a/src/lib/commands/decl.c
+++ b/src/lib/commands/decl.c
@@ -33,12 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index 2034ebcd31278b92b329fd43387c5bf025ffd6cc..f32430e483069b51fc9935437e1202e539d3b89e 100644 (file)
--- a/src/lib/commands/deli.c
+++ b/src/lib/commands/deli.c
@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
 #include "path.h"
-#include "nsc.h"
-#include "nat.h"
-#include "commands.h"
 
 int
 deli(void)

diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index 9dad2930af05cf937c96411173332de2570833f4..2e81e9b7bf77b0289f25958e078263f1c9afb6ff 100644 (file)
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.c
@@ -33,13 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 /*

diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c
index 30b6fa1c237e381b2f93b215ccc42588f00f31b9..b5b2f74ea37779b4b6a0e8457222a6096636e751 100644 (file)
--- a/src/lib/commands/desi.c
+++ b/src/lib/commands/desi.c
@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
 #include "commands.h"
+#include "map.h"
+#include "optlist.h"
+#include "path.h"
 
 static long do_desi(struct natstr *natp, char *sects, char *deschar,
                    long cash, int for_real);

diff --git a/src/lib/commands/disa.c b/src/lib/commands/disa.c
index e97fb0aca1c27d66bff364dde62b67c4e973d57e..109d477b1214cfae7ea2651947799361e0ca5e78 100644 (file)
--- a/src/lib/commands/disa.c
+++ b/src/lib/commands/disa.c
@@ -34,7 +34,9 @@
 #include <config.h>
 
 #include <fcntl.h>
-#include "misc.h"
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/dist.c b/src/lib/commands/dist.c
index b5f09347d6d2b8b2865705cd5228714ff3a0fa77..cf89b531d52f5d88366db793e180a38bde26c30a 100644 (file)
--- a/src/lib/commands/dist.c
+++ b/src/lib/commands/dist.c
@@ -35,15 +35,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "path.h"
 #include "commands.h"
+#include "path.h"
 
 /*
  * distribute <SECT> <DISTSECT|.|h>

diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index a0aba4c6cf37a2134a523c9fd1eec292b1c3993c..2775c40d935b91087b3a3093041de42bb4188a6a 100644 (file)
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
+#include "commands.h"
 #include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "path.h"
-#include "commands.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 drop(void)

diff --git a/src/lib/commands/dump.c b/src/lib/commands/dump.c
index af020b7f5d7fa6bc25780ddec1dd371e9c70df74..3073e39ea9fb91301323dd5f867b2e6d07b62d53 100644 (file)
--- a/src/lib/commands/dump.c
+++ b/src/lib/commands/dump.c
@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
 int
 dump(void)

diff --git a/src/lib/commands/echo.c b/src/lib/commands/echo.c
index fc4c194e66641bd2d556ee41742936e4d38ae233..680d559422880d97b8c64e1b47678b5603997466 100644 (file)
--- a/src/lib/commands/echo.c
+++ b/src/lib/commands/echo.c
@@ -33,8 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index e7e1a46e2b5f4ef02be7b65aed1741e09f9048a7..77647e75f05420bc78789209e8982160be81b945 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -39,23 +39,15 @@
 
 #include <ctype.h>
 #include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
-#include "plane.h"
-#include "ship.h"
 #include "land.h"
+#include "lost.h"
+#include "news.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
 
 #define END -1
 

diff --git a/src/lib/commands/enab.c b/src/lib/commands/enab.c
index 04cae1a02518a559600fda91f28ed868b75e737e..9ae4972b0c6cf764240cd174fd03bbb2f786fa89 100644 (file)
--- a/src/lib/commands/enab.c
+++ b/src/lib/commands/enab.c
@@ -33,9 +33,9 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <fcntl.h>
-#include "misc.h"
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/enli.c b/src/lib/commands/enli.c
index 2f38c6352de376cf0f71c49771812314de6af222..81e33882a8c3dd8c5b4ea0cf050699fbe05c2610 100644 (file)
--- a/src/lib/commands/enli.c
+++ b/src/lib/commands/enli.c
@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "treaty.h"
-#include "file.h"
 #include "commands.h"
+#include "treaty.h"
 
 int
 enli(void)

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index 07adc860442a66d9980af162a62ba9cdd07140e5..2c7bc42eace5ea77071756c3380f8a85f09c917a 100644 (file)
--- a/src/lib/commands/expl.c
+++ b/src/lib/commands/expl.c
@@ -33,17 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
-#include "nat.h"
+#include "map.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plague.h"
 
 static int explore_map(coord curx, coord cury, char *arg);
 

diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c
index b0c83c57dbc316392374abdb3b966d098a1b396c..b800531a6ec7969cdf45d1593a6c214af20ebe79 100644 (file)
--- a/src/lib/commands/fina.c
+++ b/src/lib/commands/fina.c
@@ -35,14 +35,8 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "loan.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
 
 /*

diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c
index e0c415bf4577db6ad0e7a98b8ed37e0b512c0241..49d186a7f39625291068795fec1ee7299e605766 100644 (file)
--- a/src/lib/commands/flash.c
+++ b/src/lib/commands/flash.c
@@ -34,11 +34,6 @@
 
 #include <config.h>
 
-#include <time.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/flee.c b/src/lib/commands/flee.c
index 07e3ad6adf828ab9d72d474f5636d4f9883109fa..267c3080f7aa099ebd5c4e6f47dbff7eee0d2627 100644 (file)
--- a/src/lib/commands/flee.c
+++ b/src/lib/commands/flee.c
@@ -34,12 +34,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "ship.h"
 
 int
 flee(void)

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 747984ac23f48f3e304967069fbd251c92319593..2d459c581a917e429eba0152ef76bb93de361c81 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -34,18 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
+#include "commands.h"
 #include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "path.h"
-#include "commands.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 fly(void)

diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index 307cd0fad05cfc4646d3d6814518b502f8d71602..3600b57e9a4235d71d2ef92ab323e5b117394e54 100644 (file)
--- a/src/lib/commands/foll.c
+++ b/src/lib/commands/foll.c
@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
+#include <ctype.h>
 
 int
 foll(void)

diff --git a/src/lib/commands/forc.c b/src/lib/commands/forc.c
index fe775a0d3697c98b50167ed9fce4c8808b48745f..9014ab38ec41a73fe2e40593da2dc86fa9eed1b9 100644 (file)
--- a/src/lib/commands/forc.c
+++ b/src/lib/commands/forc.c
@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include "misc.h"
-#include "player.h"
-#include "empthread.h"
 #include "commands.h"
+#include "empthread.h"
 #include "server.h"
 
 int

diff --git a/src/lib/commands/fort.c b/src/lib/commands/fort.c
index a457fae4a88b8068b655d054a1b2029b9313c9b3..8c0740714c3c990b0b82c828f9cfd5487cb7cca4 100644 (file)
--- a/src/lib/commands/fort.c
+++ b/src/lib/commands/fort.c
@@ -33,12 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/fuel.c b/src/lib/commands/fuel.c
index 0bead0df0a8b323f705a29eec226831e017fd8a3..449bf039306580ea40c0982b27a64a2f208890f6 100644 (file)
--- a/src/lib/commands/fuel.c
+++ b/src/lib/commands/fuel.c
@@ -33,15 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
+#include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
+#include "optlist.h"
+#include "plague.h"
 
 int
 fuel(void)

diff --git a/src/lib/commands/give.c b/src/lib/commands/give.c
index 94b0a63ca35d976fac5946ee47f00441fad22c51..3903be0c37de1e4f4122eddb315aa60ceb42eacf 100644 (file)
--- a/src/lib/commands/give.c
+++ b/src/lib/commands/give.c
@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "xy.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
+#include "news.h"
 #include "optlist.h"
 
 /*

diff --git a/src/lib/commands/grin.c b/src/lib/commands/grin.c
index f661b813a82cf77f9a438208f2ef6c97010b4fc3..c892460288d20668ca25feed9b5c205863453417 100644 (file)
--- a/src/lib/commands/grin.c
+++ b/src/lib/commands/grin.c
@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "product.h"
 #include "commands.h"
+#include "product.h"
 
 int
 grin(void)

diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index da69a5477c47b0f5d698ce844dee6fda4d2bf481..9b2c9bd9aa127b0e84db6d5c745064c60efcd213 100644 (file)
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.c
@@ -33,17 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
 #include "plane.h"
 #include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "commands.h"
 
 /*
  * harden <PLANE> <LEVEL>

diff --git a/src/lib/commands/head.c b/src/lib/commands/head.c
index 7ccd950d13691fad65eadf5c4057ef8f2e76c4fb..e3b9e7d97b09d75c10ce0841df8872c698a85eab 100644 (file)
--- a/src/lib/commands/head.c
+++ b/src/lib/commands/head.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "news.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
+#include "news.h"
 
 struct histstr {
     int h_past;

diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c
index 1cb24bd471601aeb1e08b7494643b850a8d36443..db673a67ef05ef3bc6a5f2c513f9f728229acdbd 100644 (file)
--- a/src/lib/commands/improve.c
+++ b/src/lib/commands/improve.c
@@ -33,17 +33,9 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "optlist.h"
+#include "path.h"
 
 int
 improve(void)

diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c
index 783e7b8a6e2c7590e0cfdec26faf6f76f9c02002..ee954ff0f45cc44075c4e80a7b60cbbe1828c223 100644 (file)
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -37,18 +37,14 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <errno.h>
-#include <string.h>
-#include <stdio.h>
 #include <sys/stat.h>
-#include <time.h>
 #if !defined(_WIN32)
 #include <dirent.h>
 #else
 #include <windows.h>
 #endif
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index bb70f452fdef6075536e7304da47cdf06f29e2c9..5ba37e1c2a70ed0244fe9710019bc7bd5e1cbe70 100644 (file)
--- a/src/lib/commands/land.c
+++ b/src/lib/commands/land.c
@@ -33,14 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
 
 int
 land(void)

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index 926feb5adb38db83d43492d5b5e9d7476f1a2c06..66a3552e1bd21caa9ec0df8b803fedb4b1c8f7ef 100644 (file)
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -35,21 +35,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "plane.h"
-#include "news.h"
+#include "commands.h"
+#include "damage.h"
 #include "mission.h"
-#include "ship.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
+#include "news.h"
 #include "optlist.h"
-#include "damage.h"
-#include "commands.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static int launch_as(struct plnstr *pp);
 static int launch_missile(struct plnstr *pp, int sublaunch);

diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c
index a6e2442fa66366e9e7c76c655102b31bff839c6a..8b63a775ee3ef68bbdd03e0044ff909e9e0f4188 100644 (file)
--- a/src/lib/commands/lboard.c
+++ b/src/lib/commands/lboard.c
@@ -33,19 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
+#include "combat.h"
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
 #include "mission.h"
+#include "path.h"
 #include "ship.h"
-#include "combat.h"
-#include "commands.h"
 
 int
 lboa(void)

diff --git a/src/lib/commands/ldump.c b/src/lib/commands/ldump.c
index cae052438394b6d6de47f191faf43cb697dca3ed..b3a0fc32752ce5ae859f1dedf4902213850d722c 100644 (file)
--- a/src/lib/commands/ldump.c
+++ b/src/lib/commands/ldump.c
@@ -34,16 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
+#include "commands.h"
 #include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
 
 int
 ldump(void)

diff --git a/src/lib/commands/ledg.c b/src/lib/commands/ledg.c
index 32045b81c55d49e6ddf366e491033fde25b6d2cf..d2bd805ccc072696f4041f41081153f60dbe1e38 100644 (file)
--- a/src/lib/commands/ledg.c
+++ b/src/lib/commands/ledg.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "loan.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/leve.c b/src/lib/commands/leve.c
index cee57cc392d509584513d2c3d6e07cc6d94e1c74..054a240cebfd4bec77264751f2919ba3368458be 100644 (file)
--- a/src/lib/commands/leve.c
+++ b/src/lib/commands/leve.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "path.h"
 
 int
 leve(void)

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index cf22981b4679690a0bc0244f4a09ea2abf97fff1..002c88316b0caae9a56797e51d3e8d86ebd9d445 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -35,21 +35,15 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "file.h"
-#include "plague.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
-#include "land.h"
+#include <ctype.h>
+#include "commands.h"
+#include "empobj.h"
 #include "item.h"
-#include "nsc.h"
-#include "nat.h"
+#include "land.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
 
 /*
  * The values 1 and -1 are important below, don't change them.

diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index e482dcc6a51aab7e258e88c41df1d1fbd26dd9d8..f1b229748396ffa56d05f1d403af49cfcf4073f3 100644 (file)
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -33,20 +33,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
-#include "plane.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include <fcntl.h>
 #include "commands.h"
+#include "land.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static void look_ship(struct shpstr *lookship);
 static void look_land(struct lndstr *lookland);

diff --git a/src/lib/commands/lost.c b/src/lib/commands/lost.c
index db833b313049fc2b2423d71b2e0ddcf3d769cba9..a3b3b7390a86e3dca10999e8b68bfd7f6dcfa24b 100644 (file)
--- a/src/lib/commands/lost.c
+++ b/src/lib/commands/lost.c
@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include "player.h"
-#include "nsc.h"
-#include "file.h"
-#include "lost.h"
 #include "commands.h"
+#include "lost.h"
 
 int
 lost(void)

diff --git a/src/lib/commands/lstat.c b/src/lib/commands/lstat.c
index 9b977d719b22b6efca85118b0489bfd82a1ef6a0..1b293092cd7bfb8a8fba7d6c5631d7a8377492e6 100644 (file)
--- a/src/lib/commands/lstat.c
+++ b/src/lib/commands/lstat.c
@@ -33,12 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 
 int
 lsta(void)

diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index 2dd641b49b9bf57ee620525bc74555ea8d9e5c84..0374debee4fff85d1f7616c07f07ac69370c4af9 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -37,16 +37,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "file.h"
-#include "ship.h"
+#include "commands.h"
 #include "item.h"
-#include "nsc.h"
-#include "plane.h"
 #include "land.h"
-#include "commands.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 5cae613b2a04155461a49c3b5be8489042d72e09..6fda3bf4ab694d3167aafd8a940041774f418ca9 100644 (file)
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -34,17 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
-#include "player.h"
-#include "map.h"
-#include "ship.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
 #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 df2466167ee6bcc254a08d7f2256840211f737ad..b6293e34d366eaba4bf7e14cd237416991d4fc1f 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -35,15 +35,11 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
+#include "commands.h"
 #include "file.h"
+#include "land.h"
 #include "map.h"
-#include "commands.h"
+#include "path.h"
 
 static int set_leader(struct emp_qelem *list, struct lndstr **leaderp);
 static void switch_leader(struct emp_qelem *list, int land_uid);

diff --git a/src/lib/commands/mark.c b/src/lib/commands/mark.c
index bcb2ccaf5d0d2e2cd90565837663a0ad22cd9851..82088525a06aaf7d533d09996bfb40eced5fc068 100644 (file)
--- a/src/lib/commands/mark.c
+++ b/src/lib/commands/mark.c
@@ -35,12 +35,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "item.h"
-#include "commodity.h"
-#include "player.h"
-#include "file.h"
 #include "commands.h"
+#include "commodity.h"
+#include "item.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index 11aeb9c8a867dbfa0b5cff80b253876525218dbe..f40218a3485a88c964e26a9c34574a3a3101e48c 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "retreat.h"
-#include "nsc.h"
-#include "file.h"
-#include "queue.h"
-#include <ctype.h>
-#include "optlist.h"
-#include "damage.h"
 #include "commands.h"
+#include "damage.h"
 #include "empobj.h"
+#include "optlist.h"
+#include "retreat.h"
 
 enum targ_type {
     targ_land, targ_ship, targ_sub, targ_unit, targ_bogus

diff --git a/src/lib/commands/mine.c b/src/lib/commands/mine.c
index d67f12fb4ddf5a117f62678f15b1250711d80b62..af5d94aefe27d5641aa7a23917823d99caa0e5a6 100644 (file)
--- a/src/lib/commands/mine.c
+++ b/src/lib/commands/mine.c
@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
+#include "map.h"
+#include "ship.h"
 
 /*
  * format: mine <SHIPS> <NUMBER MINES>

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 8ea878a3d3a9ed70e6e9403e7b18ae275bf88606..2621602a01b14f9f594250e1af39c7f1969db191 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -34,16 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "path.h"
-#include "mission.h"
 #include "commands.h"
-#include "optlist.h"
 #include "empobj.h"
+#include "mission.h"
+#include "optlist.h"
+#include "path.h"
 
 /*
  *  mission <type> <planes/ships/units> <mission type> <op sector> [<radius>]

diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c
index 7eae1da1c77e004211b2c8cef971664915e3224f..c50c67106caba97d6ef2462066aeac34f8ccc7e7 100644 (file)
--- a/src/lib/commands/mobq.c
+++ b/src/lib/commands/mobq.c
@@ -34,14 +34,9 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 
 int

diff --git a/src/lib/commands/mobu.c b/src/lib/commands/mobu.c
index 5f76bc033875ca65942ad1a88ed612e8331322c9..00710f1a2a3daae9cb18ca07dcb018765c031b0b 100644 (file)
--- a/src/lib/commands/mobu.c
+++ b/src/lib/commands/mobu.c
@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <time.h>
-#include "misc.h"
-#include "player.h"
-#include "nsc.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 #include "server.h"
-#include "prototypes.h"
 
 int
 mobupdate(void)

diff --git a/src/lib/commands/mora.c b/src/lib/commands/mora.c
index c4831d4b8d3602a5de68c20b655634f754462474..54efbb121d1ce926631db5cbf760a21b06f04d8c 100644 (file)
--- a/src/lib/commands/mora.c
+++ b/src/lib/commands/mora.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index 5427832a1ff6443019e9eddf7e1a06cbe99896e3..0953eb39b673f8264f937d8e27cbd1b26fb72901 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -33,19 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
 #include "land.h"
-#include "path.h"
 #include "optlist.h"
-#include "commands.h"
+#include "path.h"
+#include "plague.h"
 
 
 static int cmd_move_map(coord curx, coord cury, char *arg);

diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index 2cff13f6caf4275f59ef22b4b808d2492598ca4b..4115956e916afbc766f87d94400c9471d0c10ee2 100644 (file)
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 /*
  * name <SHIP> <NAME>

diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c
index 78f5336f5be0f63845147bd582bcb36122ff56a8..104964e88f17decf8d3980b07009d9623fe6c37b 100644 (file)
--- a/src/lib/commands/nati.c
+++ b/src/lib/commands/nati.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "sect.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
 #include "commands.h"
+#include "optlist.h"
 
 int
 nati(void)

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index f068eb3bae6a12d5a9af3e7b6cfb9e48aae666f7..a20e403956b6e69c9633861c3b8936fe6f08a4a4 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -34,18 +34,11 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 static int set_flagship(struct emp_qelem *list, struct shpstr **flagshipp);
 static void switch_flagship(struct emp_qelem *list, int ship_uid);

diff --git a/src/lib/commands/ndump.c b/src/lib/commands/ndump.c
index e781e4a247f57e61e6d666c02da82c4e64a76269..0c0347d83ae0c1a54943e0445346869eea827e91 100644 (file)
--- a/src/lib/commands/ndump.c
+++ b/src/lib/commands/ndump.c
@@ -34,12 +34,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
 
 int
 ndump(void)

diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index c8dd174d17d452c378ceb135fa67b5f65003c231..c84bf7dd34aa204158056da8324a5d407f61fb90 100644 (file)
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -33,20 +33,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "sect.h"
-#include "path.h"
-#include "file.h"
-#include "xy.h"
-#include "tel.h"
+#include <fcntl.h>
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
 #include "optlist.h"
-#include "commands.h"
-
-#include <fcntl.h>
+#include "path.h"
+#include "tel.h"
 
 static int isok(int x, int y);
 static void ok(signed char *map, int x, int y);

diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c
index d62f85d15220b9ad19f193ba9536c830beb3588f..18792c12606842124ee2f2f72a39b25d5d8b5cdd 100644 (file)
--- a/src/lib/commands/newe.c
+++ b/src/lib/commands/newe.c
@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "nat.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/news.c b/src/lib/commands/news.c
index 7effc5bc7473cadd8744e3c10a7a13e5c4cf497d..cb4fc065f10c0b4761b434486d966e26891e864e 100644 (file)
--- a/src/lib/commands/news.c
+++ b/src/lib/commands/news.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
+#include "news.h"
 #include "optlist.h"
 
 static void preport(struct nwsstr *np);

diff --git a/src/lib/commands/nuke.c b/src/lib/commands/nuke.c
index 6c51498a4dc90a05cd3f39a3cddea30d7f73c9cf..85a03c50e550f69c017c74996954a6fe6a809c05 100644 (file)
--- a/src/lib/commands/nuke.c
+++ b/src/lib/commands/nuke.c
@@ -34,15 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nuke.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
+#include "plane.h"
 
 int
 nuke(void)

diff --git a/src/lib/commands/offe.c b/src/lib/commands/offe.c
index ce7a48703aa2c74626956292c4bccba8edc6a4c0..27ecfbf585e67fbbbbecc83cbcf9170b0f28546a 100644 (file)
--- a/src/lib/commands/offe.c
+++ b/src/lib/commands/offe.c
@@ -34,16 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "loan.h"
-#include "treaty.h"
-#include "file.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
+#include "treaty.h"
 
 static int do_treaty(void);
 static int do_loan(void);

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 23c3bb355e0e8bfc9f5ffb02aadfe1c3a43e4899..f3ae6a36696f1324fb17df313db8f58dd8e67a76 100644 (file)
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -34,20 +34,12 @@
 
 #include <config.h>
 
-#include <string.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "item.h"
 #include "commands.h"
+#include "item.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 /*
  *  Command syntax:

diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index 4c0c7e52a8fb04b8375d0a62dc0c65b787e43be9..848453d6d68efa929c95f3df638dc78f03427e44 100644 (file)
--- a/src/lib/commands/orig.c
+++ b/src/lib/commands/orig.c
@@ -34,12 +34,7 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nat.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c
index 62b0a6a917158e1f2dd1c0c1ec7e745c0691e1ce..f5c1181d6d8b0af4c5458798e476765d626af0c7 100644 (file)
--- a/src/lib/commands/para.c
+++ b/src/lib/commands/para.c
@@ -34,21 +34,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
+#include "combat.h"
+#include "commands.h"
 #include "item.h"
-#include "plane.h"
 #include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #include "mission.h"
-#include "combat.h"
-#include "commands.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static int paradrop(struct emp_qelem *list, coord x, coord y);
 

diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c
index 61f058f63882de5aac6a54b0106a0f910e5099d4..36cb5045a2e132df70157124e5f85571e98f17e8 100644 (file)
--- a/src/lib/commands/path.c
+++ b/src/lib/commands/path.c
@@ -34,17 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
 
 int
 path(void)

diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c
index c8ee9225a3d0ae0618133ed2cad23520be099c9d..d55002e4ef8b9c970cd460dff916787c5df0184c 100644 (file)
--- a/src/lib/commands/payo.c
+++ b/src/lib/commands/payo.c
@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 payo(void)

diff --git a/src/lib/commands/pboa.c b/src/lib/commands/pboa.c
index dd5f0258774ad7fcff92fd97294414da7b2bae89..cf2b1a7c332cbed0fd92857e96f0c7d6dafe2965 100644 (file)
--- a/src/lib/commands/pboa.c
+++ b/src/lib/commands/pboa.c
@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "file.h"
-#include "sect.h"
-#include "plane.h"
 #include "commands.h"
+#include "plane.h"
 
 int
 pboa(void)

diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c
index e8890ae60a885b5385a3c7dad77cef40585f2509..402cf08ddc50a9e41b681f7de38648ea9dfa6fb5 100644 (file)
--- a/src/lib/commands/pdump.c
+++ b/src/lib/commands/pdump.c
@@ -34,16 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "plane.h"
-#include "nsc.h"
+#include "commands.h"
 #include "nuke.h"
-#include "file.h"
-#include "nat.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plane.h"
 
 int
 pdump(void)

diff --git a/src/lib/commands/peek.c b/src/lib/commands/peek.c
index 625fc6590175dd6d8912270e6a02a7c2e594cda7..629d40dfc8030869a97a8fb4ac60876e24be08f2 100644 (file)
--- a/src/lib/commands/peek.c
+++ b/src/lib/commands/peek.c
@@ -35,12 +35,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index 69c883a8cdf082f545646c55698d0f47ee6e0a1e..d014a06b1a05c4fdc4f8090dc3ebb50a3e543f71 100644 (file)
--- a/src/lib/commands/plan.c
+++ b/src/lib/commands/plan.c
@@ -35,14 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "nsc.h"
+#include "commands.h"
 #include "nuke.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plane.h"
 
 int
 plan(void)

diff --git a/src/lib/commands/play.c b/src/lib/commands/play.c
index b50d7216ad9f8fe866fd229ea94edf4d04d8bc32..f629dd0734a3754e56b2032476689e0cdf49b1cc 100644 (file)
--- a/src/lib/commands/play.c
+++ b/src/lib/commands/play.c
@@ -34,10 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "nat.h"
 #include "optlist.h"
 #include "commands.h"
 

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index 62a2b0b41800f8b6e4dbfc0775f3c7bbbfa6da57..90008344c59b2e96d6d48eb3bda39618a48462bb 100644 (file)
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -36,24 +36,13 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
-#include "land.h"
-#include "power.h"
+#include "commands.h"
 #include "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include "land.h"
 #include "optlist.h"
-#include "commands.h"
-
-
-#include <fcntl.h>
+#include "plane.h"
+#include "power.h"
+#include "ship.h"
 
 struct powsort {
     float powval;

diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c
index 854268801f22cdabfa26a291c9cf8c62a1540294..33a9c5c2d6365f2a98cc4f50411fedac859fbf02 100644 (file)
--- a/src/lib/commands/prod.c
+++ b/src/lib/commands/prod.c
@@ -35,17 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
+#include "commands.h"
 #include "item.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
+#include "product.h"
 
 static void prprod(coord, coord, int, double, double, int, char,
                   double, double, double, char[], int[], int[], int);

diff --git a/src/lib/commands/pstat.c b/src/lib/commands/pstat.c
index 712d443dbd8dff4c48eaacfabe099f6b9c2b8fb1..53b56425dbfccaf6636ac8574978f6318249851f 100644 (file)
--- a/src/lib/commands/pstat.c
+++ b/src/lib/commands/pstat.c
@@ -33,13 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "plane.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "plane.h"
 
 int
 pstat(void)

diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index 363246dd84d7f6eff9870dc5151ff2b24bbe5117..3bf8aa8f6293d842cb748acbb2407a1b5abcfc1b 100644 (file)
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -34,17 +34,10 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 rada(void)

diff --git a/src/lib/commands/rang.c b/src/lib/commands/rang.c
index cfb782261d14b71812c142fcef2ffc364760fc0f..3b9cecd956b61d3aa574a910fa45df1028bb5875 100644 (file)
--- a/src/lib/commands/rang.c
+++ b/src/lib/commands/rang.c
@@ -33,13 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
+#include "plane.h"
 
 int
 range(void)

diff --git a/src/lib/commands/rea.c b/src/lib/commands/rea.c
index 5e4063a9c8d59488338e8e5d571e5d3ac4d4c54c..d9cd2ab5bd7e89cdc6306964bb5b1345ee10e328 100644 (file)
--- a/src/lib/commands/rea.c
+++ b/src/lib/commands/rea.c
@@ -35,20 +35,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "tel.h"
+#include <ctype.h>
 #include "commands.h"
-#include "optlist.h"
 #include "match.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#if !defined(_WIN32)
-#include <sys/file.h>
-#endif
+#include "optlist.h"
+#include "tel.h"
 
 int
 rea(void)

diff --git a/src/lib/commands/real.c b/src/lib/commands/real.c
index 351221bd33e160d485f1f362edd38a8d77cba359..0b99a2da37fafa0f15e651af11fad2eea8907fb7 100644 (file)
--- a/src/lib/commands/real.c
+++ b/src/lib/commands/real.c
@@ -33,12 +33,7 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "xy.h"
-#include "file.h"
-#include "nsc.h"
+#include <ctype.h>
 #include "commands.h"
 
 static void

diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index e1a5ba988e6dd48c0dbe3d86d9420204ce401e0f..527f2a4a6846e7a6ab29e7f0e1a2991e10c1c692 100644 (file)
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -33,17 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #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 619a887e4d4146897ea74f30af0e1232fcf35f83..357965c3a842ec0c111d63ac656913291fdc4725 100644 (file)
--- a/src/lib/commands/reje.c
+++ b/src/lib/commands/reje.c
@@ -33,12 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index 3106c6397d437069c3d910a4a2821bbd49e9256a..264672d94ea571ace572328e7c67c4627a00a032 100644 (file)
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -33,11 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/repa.c b/src/lib/commands/repa.c
index f426433c57925ca9b33a39475264b1596912e38c..c6cf48a495044cd9b0b235fe3c64868486877abb 100644 (file)
--- a/src/lib/commands/repa.c
+++ b/src/lib/commands/repa.c
@@ -34,13 +34,9 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
+#include "commands.h"
 #include "loan.h"
 #include "news.h"
-#include "file.h"
-#include "commands.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c
index f4533923c87b70ca80d0f132c3bd348f1fff45f0..d20e222869fbb4e81f656df58947e3e794475a21 100644 (file)
--- a/src/lib/commands/repo.c
+++ b/src/lib/commands/repo.c
@@ -35,10 +35,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c
index a41f2cbfb366445a03692d7fd57c1ec3cc0ca6c4..34194ebc6bf48960a9ed8104f819105113097d99 100644 (file)
--- a/src/lib/commands/rese.c
+++ b/src/lib/commands/rese.c
@@ -35,20 +35,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "file.h"
-#include "sect.h"
+#include "commands.h"
+#include "commodity.h"
 #include "item.h"
-#include "nsc.h"
-#include "nat.h"
 #include "land.h"
+#include "optlist.h"
 #include "plane.h"
 #include "ship.h"
-#include "commodity.h"
-#include "player.h"
-#include "commands.h"
-#include "optlist.h"
 
 int
 rese(void)

diff --git a/src/lib/commands/reso.c b/src/lib/commands/reso.c
index acdbf9ea6c689d25773f69fc9976868955761055..8de6b19d2ee12292e3940b98ac4e0717baecc906 100644 (file)
--- a/src/lib/commands/reso.c
+++ b/src/lib/commands/reso.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
 #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 2b3828c27a099d9894f299f8e79470b36609c998..4bc6488e1bfb60c196025d031946c2b1c1a83b2d 100644 (file)
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -34,15 +34,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "retreat.h"
-#include "ship.h"
+#include <ctype.h>
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "path.h"
-#include "commands.h"
+#include "retreat.h"
+#include "ship.h"
 
 int
 retr(void)

diff --git a/src/lib/commands/rout.c b/src/lib/commands/rout.c
index 6d05b6f8650d40bdc40f0e65d7c1f8d87e20dd4c..57a0db07b162949af841f8aaf1f2d0d70362d9fb 100644 (file)
--- a/src/lib/commands/rout.c
+++ b/src/lib/commands/rout.c
@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
-#include "path.h"
-#include "file.h"
 #include "map.h"
-#include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
 int
 rout(void)

diff --git a/src/lib/commands/sabo.c b/src/lib/commands/sabo.c
index 4411e256a9a2d0380dc78bc4bbd9a4797b8cb22c..ab2b152e7b69501077155871c08e79153217e3da 100644 (file)
--- a/src/lib/commands/sabo.c
+++ b/src/lib/commands/sabo.c
@@ -33,11 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 
 int
 sabo(void)

diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index bbb3ca7bbd3db635c9e3b7c193e9bbf42267133f..e622053e73ec4fa6d97887beac246d19f01c0766 100644 (file)
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -34,15 +34,10 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "path.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 static int
 show_sail(struct nstr_item *nstr)

diff --git a/src/lib/commands/sate.c b/src/lib/commands/sate.c
index 6e5530f600d8c0c8d49a80e84c7d8b7d00c9ad83..2461c046559b9fc64a12d5b1906037a6c98fce4e 100644 (file)
--- a/src/lib/commands/sate.c
+++ b/src/lib/commands/sate.c
@@ -35,15 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "plane.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
+#include <ctype.h>
 #include "commands.h"
 #include "optlist.h"
+#include "plane.h"
 
 int
 sate(void)

diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index 1bd9aa150d34d0a4f832cf85fda4df0e8aac3dc0..4236a77d15c8952ec874583cc3f6cf7cd35fe0f2 100644 (file)
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
-#include "optlist.h"
 #include "empobj.h"
+#include "optlist.h"
 
 int
 scra(void)

diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index 32c7878326974468db3f7a694fcef3f9dfd593af..d2ead896f038a7d4010f980efadf3361a93acc6e 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
-#include "optlist.h"
 #include "empobj.h"
+#include "optlist.h"
 
 static void scuttle_land(struct lndstr *);
 

diff --git a/src/lib/commands/sdump.c b/src/lib/commands/sdump.c
index 18ed63eae05ea85a96eea4e37826b15b7302d800..d73017f382fc9eeb2535257c06e36fb3acf7371f 100644 (file)
--- a/src/lib/commands/sdump.c
+++ b/src/lib/commands/sdump.c
@@ -34,16 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "land.h"
+#include "optlist.h"
+#include "ship.h"
 
 int
 sdump(void)

diff --git a/src/lib/commands/sect.c b/src/lib/commands/sect.c
index ed3c285fa8ce45ee22cdd05846c5758da5ad8d63..cec2348cd7b977c612e9f605b9803e2a97e6829a 100644 (file)
--- a/src/lib/commands/sect.c
+++ b/src/lib/commands/sect.c
@@ -33,15 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c
index 763b44d1b92dae849e42a96f37a618243344302f..ffafcea6a1ce9e4ceba460130a8769173c3e52fd 100644 (file)
--- a/src/lib/commands/sell.c
+++ b/src/lib/commands/sell.c
@@ -36,22 +36,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "file.h"
-#include "sect.h"
-#include "item.h"
-#include "nsc.h"
-#include "nat.h"
-#include "plane.h"
-#include "ship.h"
-#include <math.h>              /* bailey@math-cs.kent.edu */
+#include "commands.h"
 #include "commodity.h"
+#include "item.h"
 #include "land.h"
-#include "player.h"
-#include "commands.h"
 #include "optlist.h"
-/*#define EF_COMM 10*/
+#include "plane.h"
+#include "ship.h"
 
 /*
  * format: sell <COMMODITY> <SECTS> <NUMBER> <PRICE>

diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index 404e9282189a1bd4f8551fef0c9e8f767d5dba69..8fe0c66f4b36efc8be07c04f494b689494a86173 100644 (file)
--- a/src/lib/commands/set.c
+++ b/src/lib/commands/set.c
@@ -35,19 +35,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "ship.h"
+#include "commands.h"
+#include "empobj.h"
 #include "land.h"
+#include "optlist.h"
 #include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
+#include "ship.h"
 #include "trade.h"
-#include "file.h"
-#include "player.h"
-#include "commands.h"
-#include "optlist.h"
 
 /*
  * format: set <type> <SHIP/NUKE> <PRICE>

diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 1c7a881066807925efe8354f8218186c233f6ee6..c27379ace2852a212f93cf6c8b147cdb14555905 100644 (file)
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -35,15 +35,7 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 /*

diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 8e9b373ac8ea8e19244dedbdf79136e23e6db6a1..66eaed3bc2b908ca5980a1dc9fcaa64a79c61de4 100644 (file)
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -34,17 +34,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "lost.h"
+#include "news.h"
 #include "optlist.h"
 
 

diff --git a/src/lib/commands/shar.c b/src/lib/commands/shar.c
index 898454845a4709b8f1f12105839af16b2422d6db..4c2dff5c200b0c2e1bae1b911f52f348e7489fae 100644 (file)
--- a/src/lib/commands/shar.c
+++ b/src/lib/commands/shar.c
@@ -33,11 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nsc.h"
-#include "nat.h"
-#include "player.h"
-#include "file.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/shark.c b/src/lib/commands/shark.c
index 96b8a8651130214ec412377bb3509ec132be910a..e13ebe9ff0f7912de4fab76d2aec7fa6ee822374 100644 (file)
--- a/src/lib/commands/shark.c
+++ b/src/lib/commands/shark.c
@@ -35,13 +35,8 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "file.h"
-#include "loan.h"
-#include "nat.h"
-#include "xy.h"
-#include "player.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
 
 int

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 434011e64177e7adf52134eea27a2e3244686ba2..dc2f4c813a61b735df4a4e4f54cf270632fb65a4 100644 (file)
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "land.h"
+#include "optlist.h"
+#include "ship.h"
 
 int
 shi(void)

diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c
index 28657c0d52043814f047acffd03a2e8230b19c4b..b3a9c2cc45e0ed8263e6c429f4aac30a1461d289 100644 (file)
--- a/src/lib/commands/shoo.c
+++ b/src/lib/commands/shoo.c
@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "news.h"
+#include "commands.h"
 #include "item.h"
-#include "path.h"
-#include "nat.h"
-#include "file.h"
-#include "nsc.h"
 #include "land.h"
-#include "commands.h"
+#include "news.h"
+#include "path.h"
 
 int
 shoo(void)

diff --git a/src/lib/commands/show.c b/src/lib/commands/show.c
index 772e449090bf928ef4d5bc1510f824ac5be5706b..0f04c864ae5dede2f8396d0f57716b815c52a173 100644 (file)
--- a/src/lib/commands/show.c
+++ b/src/lib/commands/show.c
@@ -34,13 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "optlist.h"
-#include "subs.h"
 #include "commands.h"
+#include "nuke.h"
+#include "optlist.h"
 
 int
 show(void)

diff --git a/src/lib/commands/shut.c b/src/lib/commands/shut.c
index 3f8e43495d64d0b29e9c4eae776b74fcb2b62176..59b5020c472de6ba3e49c081bb95403921d703f1 100644 (file)
--- a/src/lib/commands/shut.c
+++ b/src/lib/commands/shut.c
@@ -33,15 +33,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include "misc.h"
-#include "player.h"
-#include "empthread.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
+#include "empthread.h"
 #include "server.h"
-#include "prototypes.h"
 
 int
 shut(void)

diff --git a/src/lib/commands/sinf.c b/src/lib/commands/sinf.c
index 96ff871600f35949d1a750ca7e668a5fdea649b9..65a1b06a5d13449d7d683a60cb67597b7b3fce2e 100644 (file)
--- a/src/lib/commands/sinf.c
+++ b/src/lib/commands/sinf.c
@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
+#include "combat.h"
+#include "commands.h"
 #include "optlist.h"
 #include "path.h"
-#include "commands.h"
-#include "combat.h"
 
 static void prmobcost(struct sctstr *, int);
 

diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 90f27b7e49c8672c25ac3254c4628043cfe7437b..df47e0120300d3efbdd1e914133b327e7a34a264 100644 (file)
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "plane.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 #include "optlist.h"
+#include "plane.h"
 
 #define        TSIZE   200
 

diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index 75c7308a322a07af183462ba0182bafde39aa67c..333038ecf198c84eb8fccd553c2789885df6ba34 100644 (file)
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.c
@@ -34,22 +34,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "retreat.h"
-#include "ship.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "queue.h"
-#include "plane.h"
-#include <fcntl.h>
-#include <ctype.h>
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
+#include "plane.h"
+#include "retreat.h"
+#include "ship.h"
 
 static int blankrow(char *);
 

diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index c7999c74ecf0380e718971505cb4e44570f8a61e..9c57ca205f53e969910749e5eb83651e721a83a5 100644 (file)
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.c
@@ -34,19 +34,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
+#include "commands.h"
 #include "item.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "news.h"
-#include "path.h"
-#include "file.h"
 #include "land.h"
-#include "commands.h"
+#include "map.h"
+#include "news.h"
 #include "optlist.h"
+#include "path.h"
+#include "plane.h"
 
 /*
  * format:  spy <SECTS>

diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c
index e72f5b3e72995877caf02449a05280aa94466deb..41e4a15aa7336367515d7d7fba762f6f77b9ffe4 100644 (file)
--- a/src/lib/commands/sstat.c
+++ b/src/lib/commands/sstat.c
@@ -33,12 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
+#include "ship.h"
 
 int
 sstat(void)

diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c
index a21871ed9cfc7e2948e7bc6ab997ea62f73d2b72..6e452f4a937499706bb8b11d4d3c60ec8d1e610e 100644 (file)
--- a/src/lib/commands/stop.c
+++ b/src/lib/commands/stop.c
@@ -35,13 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "path.h"
-#include "file.h"
+#include <ctype.h>
 #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 6c0ae748f1a2dfd2d0fc33af5e07bc4d84936fbd..271e72aa808f01cee11b8805cd0280887c3af245 100644 (file)
--- a/src/lib/commands/stre.c
+++ b/src/lib/commands/stre.c
@@ -33,18 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "path.h"
+#include "ship.h"
 
 static double units_in_sector(struct combat *def);
 static void stre_hdr(void);

diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c
index b8feae56e2ff83b673b642c692de8fe2e7613ea6..2811a4dca3a3fbba0a427d197a801508adf76c23 100644 (file)
--- a/src/lib/commands/strv.c
+++ b/src/lib/commands/strv.c
@@ -34,19 +34,12 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
+#include "commands.h"
 #include "item.h"
-#include "ship.h"
-#include "optlist.h"
 #include "land.h"
-#include "commands.h"
+#include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 static void starv_sects(char *range);
 static void starv_ships(char *range);

diff --git a/src/lib/commands/supp.c b/src/lib/commands/supp.c
index a88ada626c60e679f20b4309456c2e2fd9834413..48e6b668e8df470e6a1c262415f338ecd9d5d48e 100644 (file)
--- a/src/lib/commands/supp.c
+++ b/src/lib/commands/supp.c
@@ -33,12 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 
 int
 supp(void)

diff --git a/src/lib/commands/surv.c b/src/lib/commands/surv.c
index 910091e56f81a2bbdcf3a9d51f50a8449f5ad625..e2a795391aa85b479bf71128323ff63ed655eb43 100644 (file)
--- a/src/lib/commands/surv.c
+++ b/src/lib/commands/surv.c
@@ -34,15 +34,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
 
 static char code_char(struct valstr, struct sctstr *sp);

diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index 0f86ac02ba544f610c540f31d9db661cde391fc3..68c892d4f5955413c67ac3ca071731d5742b09df 100644 (file)
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -33,15 +33,7 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 static void print_res(struct sctstr *);

diff --git a/src/lib/commands/tele.c b/src/lib/commands/tele.c
index fea31012d629b1a6cd5a01c57efa01a3ec63c6da..f63c214e9fa224eca9a251301e62e682f2ed979e 100644 (file)
--- a/src/lib/commands/tele.c
+++ b/src/lib/commands/tele.c
@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "tel.h"
-#include "news.h"
-#include "file.h"
 #include "commands.h"
+#include "news.h"
 #include "optlist.h"
+#include "tel.h"
 
 int
 tele(void)

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 4f2d7c1eb8a223835fb8cdcefbe829b2bde1c0e3..40a83cb3ace0e2fd251727fee5dc8e26767e0b6b 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -35,19 +35,12 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "xy.h"
-#include "file.h"
-#include "ship.h"
+#include "commands.h"
 #include "item.h"
-#include "nsc.h"
-#include "nat.h"
 #include "land.h"
+#include "plague.h"
 #include "plane.h"
-#include "commands.h"
+#include "ship.h"
 
 static void expose_ship(struct shpstr *s1, struct shpstr *s2);
 static int tend_land(struct shpstr *tenderp, char *units);

diff --git a/src/lib/commands/terr.c b/src/lib/commands/terr.c
index c6f18f65f911844867d81328b2158c870eec5c32..e24225dc0f7405705140874130329520de48c1ee 100644 (file)
--- a/src/lib/commands/terr.c
+++ b/src/lib/commands/terr.c
@@ -33,13 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c
index 369798dfa0b306f9c1c749cb9db814ce037c48c9..da1b5d5b888f1fd69a69934e8e2ef5c36541d4a7 100644 (file)
--- a/src/lib/commands/thre.c
+++ b/src/lib/commands/thre.c
@@ -34,15 +34,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "item.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
+#include "item.h"
 
 /*
  * threshold <COMM> <SECTS> <THRESH>

diff --git a/src/lib/commands/togg.c b/src/lib/commands/togg.c
index 531398e7be31cc5bc599fe377586b7cd7af449bc..3bb88ea6017d6cde3c1051704b7a959bdad3aa4a 100644 (file)
--- a/src/lib/commands/togg.c
+++ b/src/lib/commands/togg.c
@@ -34,10 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index 37bc837b5f1e518fab83dbaf1764dfebe60565f9..d81b9e38ea7bdaea18aa38dea5bb985eecdb94f4 100644 (file)
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -36,19 +36,12 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "file.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
-#include "news.h"
-#include "retreat.h"
-#include "damage.h"
 #include "commands.h"
+#include "damage.h"
+#include "news.h"
 #include "optlist.h"
+#include "retreat.h"
+#include "ship.h"
 
 static void anti_torp(int f, int ntorping, int vshipown);
 static int candchrg(struct shpstr *, struct shpstr *);

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 75773d06e154278622feaf1c0b969eb9ae154b4c..15c41bb626c89090b00141d085ceea755fe8e054 100644 (file)
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -36,23 +36,17 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include "commands.h"
+#include "commodity.h"
+#include "empobj.h"
+#include "land.h"
+#include "loan.h"
 #include "news.h"
-#include "ship.h"
 #include "nuke.h"
-#include "land.h"
+#include "optlist.h"
 #include "plane.h"
+#include "ship.h"
 #include "trade.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "player.h"
-#include "commodity.h"
-#include "loan.h"
-#include "commands.h"
-#include "optlist.h"
 
 /*
  * format: trade

diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 601b1f7b58c46d28884fc52cca9c6dbcaafd0ddf..d810c0c5d3411e903836114337d509be49c152d5 100644 (file)
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -34,19 +34,11 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
+#include "commands.h"
+#include "land.h"
 #include "nuke.h"
-#include "xy.h"
-#include "nsc.h"
 #include "plane.h"
 #include "ship.h"
-#include "file.h"
-#include "nat.h"
-#include "land.h"
-#include "commands.h"
 
 static int tran_pmap(coord curx, coord cury, char *arg);
 static int tran_nmap(coord curx, coord cury, char *arg);

diff --git a/src/lib/commands/trea.c b/src/lib/commands/trea.c
index 89e4bb2e5dbc74708cc49f9c52ce0be67a0a3d65..8873125d76d099bfd98636b1e6755f8b87e8aa48 100644 (file)
--- a/src/lib/commands/trea.c
+++ b/src/lib/commands/trea.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "treaty.h"
-#include "file.h"
 #include "commands.h"
+#include "treaty.h"
 
 int
 trea(void)

diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c
index 7bf53c5434f83eb0e618f62f0be921c9a9accdda..5876cff58a000333446fef0e7aca846fe1e30dea 100644 (file)
--- a/src/lib/commands/turn.c
+++ b/src/lib/commands/turn.c
@@ -34,10 +34,9 @@
 #include <config.h>
 
 #include <errno.h>
-#include <fcntl.h>
-#include <time.h>
-#include "misc.h"
-#include "player.h"
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
 #include "tel.h"
 #include "commands.h"
 #include "optlist.h"

diff --git a/src/lib/commands/upda.c b/src/lib/commands/upda.c
index e18472e65f91616149f9b09a69e16a5621b9ba5f..36f82188987a69458fc4b1bf89fba783ce8f98aa 100644 (file)
--- a/src/lib/commands/upda.c
+++ b/src/lib/commands/upda.c
@@ -33,15 +33,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <time.h>
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 #include "optlist.h"
-#include "wantupd.h"
 #include "server.h"
+#include "wantupd.h"
 
 /*
  * Tell what the update policy is, and when the next update

diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index 90d7623bb218a5d16e66dca5fef86e07dbb877d8..23d67b616f11a1d4337921d6d01037e406e61f87 100644 (file)
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -34,17 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "ship.h"
+#include "commands.h"
 #include "land.h"
 #include "plane.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "commands.h"
+#include "ship.h"
 
 enum {
   UPGR_COST = 15,              /* how much avail and money to charge */

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index cc1c72c1dd5d2158bff9155282b22575bfef94ac..4725c314f08ef4cd70244b38429d4143d514a757 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -39,15 +39,11 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <time.h>
-#include "misc.h"
-#include "player.h"
-#include "version.h"
-#include "ship.h"
-#include "optlist.h"
 #include "commands.h"
-#include "file.h"
+#include "nuke.h"
+#include "optlist.h"
+#include "ship.h"
+#include "version.h"
 
 static void show_custom(void);
 static void show_opts(int val);

diff --git a/src/lib/commands/wai.c b/src/lib/commands/wai.c
index 442a66c105cef862d2775a904f1c29806b5c952e..9968e676495b729051808b466832a100d2c7ec90 100644 (file)
--- a/src/lib/commands/wai.c
+++ b/src/lib/commands/wai.c
@@ -33,12 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "empio.h"
 #include "commands.h"
+#include "empio.h"
 
 int
 wai(void)

diff --git a/src/lib/commands/wing.c b/src/lib/commands/wing.c
index ba4419134ad93c1b687b81fb3a121eebd1e3b0a8..38a72fedd7abf05b8e29c7b5c29103d03c350b48 100644 (file)
--- a/src/lib/commands/wing.c
+++ b/src/lib/commands/wing.c
@@ -34,12 +34,8 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "plane.h"
 
 int
 wing(void)

diff --git a/src/lib/commands/wipe.c b/src/lib/commands/wipe.c
index 90e16e43dac5ea4f60d58031a8ce3a44881a0d08..232a7127f5a2074270b2dca1fdbac037dc9dc893 100644 (file)
--- a/src/lib/commands/wipe.c
+++ b/src/lib/commands/wipe.c
@@ -33,13 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
 #include "commands.h"
 
 int

diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c
index b7174e1549c490d52a9f1218e26431d83f4b341d..1e11680f87adfc1dc1bcfaa4b3ddb77ea5af0ad8 100644 (file)
--- a/src/lib/commands/work.c
+++ b/src/lib/commands/work.c
@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
+#include "commands.h"
 #include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
 
 static int buildeff(struct sctstr *, int, double *);
 

diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c
index d7647818f1f9ebe0a4c53ccb3f941379fa213ac5..0052323beab87d25ae07a494359dd56b71775683 100644 (file)
--- a/src/lib/commands/xdump.c
+++ b/src/lib/commands/xdump.c
@@ -74,15 +74,15 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <stddef.h>
-#include "misc.h"
-#include "file.h"
+#include "commands.h"
+#include "empobj.h"
 #include "match.h"
 #include "news.h"
-#include "nsc.h"
 #include "optlist.h"
+#include "treaty.h"
 #include "version.h"
-#include "commands.h"
 
 /*
  * Evaluate a attribute of an object into VAL, return VAL.

diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c
index cf011564a3efdb53dc2b371940fbfe899fc3e920..c97e226cfb7f3239939728870b1168cc16d860ac 100644 (file)
--- a/src/lib/commands/zdon.c
+++ b/src/lib/commands/zdon.c
@@ -51,13 +51,8 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "empthread.h"
 #include "commands.h"
+#include "empthread.h"
 #include "optlist.h"
 #include "server.h"
 

diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c
index 5df5601ca3e399bd2c2a4f2ba5d81a8e07045fd3..97c8b15ff07bd2c524a7d4e30eecde7d8d1258c2 100644 (file)
--- a/src/lib/common/bestpath.c
+++ b/src/lib/common/bestpath.c
@@ -45,14 +45,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "sect.h"
 #include "file.h"
+#include "misc.h"
 #include "nat.h"
-#include "path.h"
-#include "common.h"
 #include "optlist.h"
+#include "path.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "xy.h"
 
 static int owned_and_navigable(char *, int, int, int);
 

diff --git a/src/lib/common/bridgefall.c b/src/lib/common/bridgefall.c
index e9a4c99ea6a26cefea55a4cc44f5b2f44107e223..40eed68dde2b20a1f708e4de01efda106419489c 100644 (file)
--- a/src/lib/common/bridgefall.c
+++ b/src/lib/common/bridgefall.c
@@ -33,19 +33,20 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
-#include "path.h"
 #include "file.h"
-#include "xy.h"
-#include "plane.h"
 #include "land.h"
-#include "nsc.h"
-#include "common.h"
-#include "subs.h"
 #include "lost.h"
+#include "misc.h"
+#include "nat.h"
+#include "nsc.h"
+#include "nuke.h"
 #include "optlist.h"
+#include "path.h"
+#include "plague.h"
+#include "plane.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "xy.h"
 
 void
 bridgefall(struct sctstr *sp, struct emp_qelem *list)

diff --git a/src/lib/common/check.c b/src/lib/common/check.c
index a41951247e50e3c5c3bc67e30d3f2084a35c0f59..996051589ea3179baa87c3849ebf26bfe973e918 100644 (file)
--- a/src/lib/common/check.c
+++ b/src/lib/common/check.c
@@ -33,21 +33,21 @@
 
 #include <config.h>
 
+#include "commodity.h"
+#include "file.h"
+#include "land.h"
+#include "loan.h"
 #include "misc.h"
+#include "nat.h"
+#include "nsc.h"
+#include "nuke.h"
+#include "plane.h"
 #include "player.h"
-#include "xy.h"
-#include "file.h"
+#include "prototypes.h"
 #include "sect.h"
 #include "ship.h"
-#include "plane.h"
-#include "nuke.h"
-#include "land.h"
-#include "nsc.h"
-#include "nat.h"
-#include "commodity.h"
-#include "loan.h"
-#include "commands.h"
 #include "trade.h"
+#include "xy.h"
 
 /* Note that timestamps make things tricky.  And, we don't
  * really care about the timestamp, we just care about the rest

diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c
index 27693f75751ee046860ad4254246c5b1e3825baf..82c6ba7a66c957638cef702185b3682f0b5a5aa3 100644 (file)
--- a/src/lib/common/conftab.c
+++ b/src/lib/common/conftab.c
@@ -36,10 +36,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <time.h>
-
-#include "prototypes.h"
-#include "optlist.h"
 #include "file.h"
+#include "optlist.h"
+#include "product.h"
+#include "prototypes.h"
 
 static int read_custom_table_file(char *);
 

diff --git a/src/lib/common/damage.c b/src/lib/common/damage.c
index 2237752dbbcb835fec3afa0b08dfb14ed883b798..dd955073fc7630443eaddc3869093c1bb1c22954 100644 (file)
--- a/src/lib/common/damage.c
+++ b/src/lib/common/damage.c
@@ -34,19 +34,17 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "ship.h"
+#include <fcntl.h>
+#include "damage.h"
 #include "land.h"
-#include "plane.h"
-#include "nuke.h"
+#include "misc.h"
 #include "nsc.h"
-#include <fcntl.h>
+#include "nuke.h"
 #include "optlist.h"
-#include "damage.h"
-#include "common.h"
-#include "gen.h"
-#include "subs.h"
+#include "plane.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 
 void
 item_damage(int pct, short *item)

diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c
index 08a3c7c59bf59df3e8b926db73f676ab069e9ed8..a2ceb28a447923fccfe4a129e03ddb5e267512f4 100644 (file)
--- a/src/lib/common/ef_verify.c
+++ b/src/lib/common/ef_verify.c
@@ -35,10 +35,11 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-
-#include "prototypes.h"
+#include <stdlib.h>
 #include "file.h"
+#include "misc.h"
 #include "nsc.h"
+#include "product.h"
 
 static void verify_fail(int, int, struct castr *, int, char *, ...)
     ATTRIBUTE((format (printf, 5, 6)));

diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index 4d670461d267efbe4ff3d2f548fe5f6491ce11e3..3ee3f7c5dcb2c726d84da1ab60199bbead4c8a5b 100644 (file)
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -38,18 +38,16 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
 #if !defined(_WIN32)
+#include <sys/types.h>
 #include <unistd.h>
 #endif
-#include "common.h"
 #include "file.h"
-#include "gen.h"
 #include "match.h"
 #include "misc.h"
 #include "nsc.h"
 #include "optlist.h"
+#include "prototypes.h"
 
 static int fillcache(struct empfile *, int);
 static int do_write(struct empfile *, void *, int, int);

diff --git a/src/lib/common/fsize.c b/src/lib/common/fsize.c
index 72f56cb83685d9b1c8469a1eb359c1754d401e58..fa02bb13e603ef53268f8dbf480ee09865caadde 100644 (file)
--- a/src/lib/common/fsize.c
+++ b/src/lib/common/fsize.c
@@ -35,15 +35,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "common.h"
-
 #include <fcntl.h>
 #include <sys/stat.h>
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
 
+#include "prototypes.h"
+
 /*
  * return the size of the file in bytes.
  */

diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c
index 112f168b026cf0c8b57fa3bb1554c6b843e46c81..c5e8a3d6c70d9fdaadeda49e7f1debd13770fd51 100644 (file)
--- a/src/lib/common/hap_fact.c
+++ b/src/lib/common/hap_fact.c
@@ -33,14 +33,14 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
 #include "nat.h"
 #include "nsc.h"
-#include "common.h"
+#include "player.h"
+#include "prototypes.h"
+#include "xy.h"
 
 double
 hap_fact(struct natstr *tnat, struct natstr *vnat)

diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c
index d11f5e06c2f88a939ab503fe228b1c6aba62c5e6..94d73a967cb39fb3aa94131ba84d4dfc60fe9790 100644 (file)
--- a/src/lib/common/hours.c
+++ b/src/lib/common/hours.c
@@ -36,6 +36,7 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <limits.h>
 #include <time.h>
 #include "misc.h"

diff --git a/src/lib/common/journal.c b/src/lib/common/journal.c
index 4f8075ba09fe0319fbc7b6787851696346cda87f..60a3297c27101c0cd26cdfc6ce7348ce3341f630 100644 (file)
--- a/src/lib/common/journal.c
+++ b/src/lib/common/journal.c
@@ -52,7 +52,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
 #include "misc.h"
 #include "empthread.h"

diff --git a/src/lib/common/land.c b/src/lib/common/land.c
index f277b62d0b843f9efd299a8b2f7c2481d2530490..a19b717255094de3dd81acf6f63e03981bc753ad 100644 (file)
--- a/src/lib/common/land.c
+++ b/src/lib/common/land.c
@@ -33,16 +33,15 @@
 
 #include <config.h>
 
+#include "file.h"
+#include "land.h"
 #include "misc.h"
-#include "sect.h"
 #include "nat.h"
-#include "file.h"
+#include "nsc.h"
 #include "path.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "common.h"
-#include "subs.h"
 
 int
 adj_units(coord x, coord y, natid own)

diff --git a/src/lib/common/log.c b/src/lib/common/log.c
index 17e2cdf292d9cd4cce8ddae441733436be1a97d4..621f204a1e4cfc56b35776583f5ccfe136ba591b 100644 (file)
--- a/src/lib/common/log.c
+++ b/src/lib/common/log.c
@@ -34,18 +34,16 @@
 #include <config.h>
 
 #include "misc.h"
-#include <stdlib.h>
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
-#include "player.h"
-#include "common.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
 
 /* Debugging?  If yes call abort() on internal error.  */
 int debug = 0;

diff --git a/src/lib/common/mailbox.c b/src/lib/common/mailbox.c
index 44740fb5efdd54bb50c3544650d68d67ace507c9..6f8c396e886211815f8be59e2d937c886cd8f1f4 100644 (file)
--- a/src/lib/common/mailbox.c
+++ b/src/lib/common/mailbox.c
@@ -33,10 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "tel.h"
-#include "optlist.h"
 #include <stdio.h>
+#include "optlist.h"
+#include "tel.h"
 
 char *
 mailbox(char *buf, natid cn)

diff --git a/src/lib/common/maps.c b/src/lib/common/maps.c
index df8611f84c776f441d47021b7cffa6397339368d..44eef4594cd2c85e624c0007320156dfcc2a34e2 100644 (file)
--- a/src/lib/common/maps.c
+++ b/src/lib/common/maps.c
@@ -34,21 +34,23 @@
 
 #include <config.h>
 
+#include <ctype.h>
+#include "com.h"
+#include "empobj.h"
+#include "file.h"
+#include "land.h"
+#include "map.h"
 #include "misc.h"
+#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 "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "map.h"
 #include "ship.h"
-#include "land.h"
-#include "plane.h"
-#include "common.h"
-#include "gen.h"
-#include "subs.h"
-#include "optlist.h"
+#include "xy.h"
 
 static int bmnxtsct(struct nstr_sect *);
 static char map_char(unsigned char type, natid own, int owner_or_god);

diff --git a/src/lib/common/move.c b/src/lib/common/move.c
index 06564b760bd2fa71d99ef943b7a73ed6c85832d8..01c8544275988110413004b4b57ec95753288f86 100644 (file)
--- a/src/lib/common/move.c
+++ b/src/lib/common/move.c
@@ -34,11 +34,10 @@
 #include <config.h>
 
 #include "misc.h"
-#include "xy.h"
-#include "sect.h"
-#include "path.h"
 #include "nat.h"
-#include "common.h"
+#include "path.h"
+#include "sect.h"
+#include "xy.h"
 
 double
 sector_mcost(struct sctstr *sp, int mobtype)

diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c
index 2e1fdcb2c05be8658ea2796272e4169cc2344e46..96ca6b0eb890719e6b6e141a37f5c750a445ec85 100644 (file)
--- a/src/lib/common/nat.c
+++ b/src/lib/common/nat.c
@@ -33,11 +33,10 @@
 
 #include <config.h>
 
-#include "prototypes.h"
+#include "file.h"
 #include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "optlist.h"
+#include "sect.h"
 
 char *relates[] = {
     /* must follow nation relation defines in nat.h */

diff --git a/src/lib/common/path.c b/src/lib/common/path.c
index a1062ff9730bb2b6d4f64156549410a3d172882b..33720cd36f4014bbb0850d0a5eea4c48ba33e10c 100644 (file)
--- a/src/lib/common/path.c
+++ b/src/lib/common/path.c
@@ -37,17 +37,15 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "../as/as.h"
+#include "file.h"
 #include "misc.h"
+#include "optlist.h"
 #include "path.h"
-#include "xy.h"
+#include "prototypes.h"
 #include "sect.h"
-#include "file.h"
-#include "common.h"
-#include "gen.h"
-#include "optlist.h"
+#include "xy.h"
+#include <stdio.h>
 
 #define        BP_ASHASHSIZE   128     /* A* queue hash table size */
 #define        BP_NEIGHBORS    6       /* max number of neighbors */

diff --git a/src/lib/common/res_pop.c b/src/lib/common/res_pop.c
index bef7ccbecf370ca34853a05fb174b23c62aaee68..9e8c0a1725d7c31096821dfc49e00866cdecff6a 100644 (file)
--- a/src/lib/common/res_pop.c
+++ b/src/lib/common/res_pop.c
@@ -34,13 +34,13 @@
 
 #include <config.h>
 
+#include "item.h"
 #include "misc.h"
-#include "sect.h"
 #include "nat.h"
-#include "item.h"
-#include "xy.h"
 #include "optlist.h"
-#include "common.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "xy.h"
 
 int
 max_population(float research, int desig, int eff)

diff --git a/src/lib/common/sectdamage.c b/src/lib/common/sectdamage.c
index fd1ac2eed3178fab685ce34e40ac56ac6e85ea91..2fac5e5604b5d7241b627cfdb3357a470d8bd152 100644 (file)
--- a/src/lib/common/sectdamage.c
+++ b/src/lib/common/sectdamage.c
@@ -34,21 +34,19 @@
 
 #include <config.h>
 
+#include "combat.h"
+#include "damage.h"
+#include "file.h"
+#include "land.h"
 #include "misc.h"
+#include "nat.h"
+#include "nsc.h"
+#include "optlist.h"
+#include "plane.h"
+#include "prototypes.h"
 #include "sect.h"
 #include "ship.h"
-#include "land.h"
-#include "plane.h"
 #include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
-#include "damage.h"
-#include "common.h"
-#include "gen.h"
-#include "subs.h"
-#include "combat.h"
 
 int
 sect_damage(struct sctstr *sp, int dam, struct emp_qelem *list)

diff --git a/src/lib/common/stmtch.c b/src/lib/common/stmtch.c
index 0d697a64c0413d679c309121bd4643db572f5a6b..93251992a035d066ca3509d03c3cb72067307138 100644 (file)
--- a/src/lib/common/stmtch.c
+++ b/src/lib/common/stmtch.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "match.h"
 
 /*

diff --git a/src/lib/common/tfact.c b/src/lib/common/tfact.c
index cf8140308ccf0c224428cbe4323c299b671a1867..79e884c2c9ed385fc6060a7742c6167f6f92f2ad 100644 (file)
--- a/src/lib/common/tfact.c
+++ b/src/lib/common/tfact.c
@@ -33,10 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
 #include "file.h"
-#include "optlist.h"
+#include "nat.h"
 
 double
 tfact(natid cn, double mult)

diff --git a/src/lib/common/type.c b/src/lib/common/type.c
index d4d929643c1dcf3e08e8e2340fa9c6353c6fa115..37e0c1bcb9eab06e5108efe107b04ec959d0e349 100644 (file)
--- a/src/lib/common/type.c
+++ b/src/lib/common/type.c
@@ -35,17 +35,16 @@
 
 #include <config.h>
 
-#include <stddef.h>
-#include <string.h>
-#include "misc.h"
-#include "ship.h"
+#include "file.h"
+#include "item.h"
 #include "land.h"
+#include "match.h"
+#include "nuke.h"
 #include "plane.h"
+#include "product.h"
+#include "prototypes.h"
 #include "sect.h"
-#include "nuke.h"
-#include "file.h"
-#include "common.h"
-#include "match.h"
+#include "ship.h"
 
 /*
  * Return index of sector called NAME in dchr[], or M_NOTFOUND.

diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index 392869df0d705332d7dc548dabe831b37bed07cf..7ad016edaafad0f503a8236ce357f575f87bb99f 100644 (file)
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -33,20 +33,18 @@
 
 #include <config.h>
 
+#include <fcntl.h>
 #include <stdio.h>
+#include <time.h>
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
+#include "file.h"
 #include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "wantupd.h"
 #include "optlist.h"
-#include "common.h"
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <time.h>
+#include "prototypes.h"
+#include "wantupd.h"
 
 void
 update_policy_check(void)

diff --git a/src/lib/common/xundump.c b/src/lib/common/xundump.c
index 53f4a0f85eae60de623ea022e581d73638cb8299..544567cd79fd3c3567b413ddc93a47cf8d2583ce 100644 (file)
--- a/src/lib/common/xundump.c
+++ b/src/lib/common/xundump.c
@@ -48,14 +48,10 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <ctype.h>
-#include <string.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <time.h>
-
 #include "file.h"
 #include "match.h"
 #include "nsc.h"

diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index 524b74d424dff9014e188938de9b6c9e49dadf80..819f907fa7a0f2b4f5b9af0b5221230c08ffa12b 100644 (file)
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -37,13 +37,13 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include "file.h"
 #include "misc.h"
-#include "xy.h"
 #include "nat.h"
-#include "sect.h"
-#include "file.h"
-#include "common.h"
 #include "optlist.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "xy.h"
 
 /*
  * return pointer to a string containing the x,y

diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c
index 721c3fc4a4fb8c61e487f52b7e4f7a4afbe91f94..9863a4253174adb99ea05ac214cda637b59e8fd4 100644 (file)
--- a/src/lib/empthread/lwp.c
+++ b/src/lib/empthread/lwp.c
@@ -37,6 +37,7 @@
 #include <signal.h>
 #include <time.h>
 #include "empthread.h"
+#include "misc.h"
 
 /* Flags that were passed to empth_init() */
 static int empth_flags;

diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c
index 9b2cce43954f2a839cd8a500cf6523f17deef425..ce5c7fb1b59091b01694a30a10cffe107dc67bb9 100644 (file)
--- a/src/lib/empthread/ntthread.c
+++ b/src/lib/empthread/ntthread.c
@@ -46,20 +46,18 @@
 
 #include <config.h>
 
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
 #include <time.h>
-#include "misc.h"
-#include "empthread.h"
-#include "prototypes.h"
-
 #define WIN32
 #include <winsock2.h>
 #undef NS_ALL
 #include <windows.h>
 #include <process.h>
+#include "misc.h"
+#include "empthread.h"
 
 #define loc_MIN_THREAD_STACK  16384
 

diff --git a/src/lib/empthread/posix.c b/src/lib/empthread/posix.c
index 015080ed3e9be1e6f904b643dc7c0737d96fb0d8..afebb5ecbb63923e1adba7ce21a6339a6a35fe40 100644 (file)
--- a/src/lib/empthread/posix.c
+++ b/src/lib/empthread/posix.c
@@ -34,6 +34,7 @@
 #include <config.h>
 
 #include <signal.h>
+#include <unistd.h>
 #include "empthread.h"
 #include "prototypes.h"
 

diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c
index b43527b5cb4102db169e5bd9fc7d2ca509b66a12..8460daac562babc2414a9848f73193f0877c869f 100644 (file)
--- a/src/lib/empthread/pthread.c
+++ b/src/lib/empthread/pthread.c
@@ -38,22 +38,20 @@
 
 #include <config.h>
 
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
 #if !defined(_WIN32)
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
 
 #include "misc.h"
 #include "empthread.h"
-#include "prototypes.h"
-
-#include <stdarg.h>
 
 #define EMPTH_KILLED  1
 

diff --git a/src/lib/gen/chance.c b/src/lib/gen/chance.c
index 2f8017f953a60f8f4284b1fd3a2005790f276866..801f6e37668eebe4aec17bbb6e4e386de4882a35 100644 (file)
--- a/src/lib/gen/chance.c
+++ b/src/lib/gen/chance.c
@@ -34,7 +34,7 @@
 #include <config.h>
 
 #include <math.h>
-#include "gen.h"
+#include "prototypes.h"
 
 int
 chance(double d)

diff --git a/src/lib/gen/copy.c b/src/lib/gen/copy.c
index e2502e4a48e634114034faa7923dd5aa98057030..dd57af3153dbc6003b7b92ac16994162361b113d 100644 (file)
--- a/src/lib/gen/copy.c
+++ b/src/lib/gen/copy.c
@@ -33,11 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
 #include "map.h"
-#include "gen.h"
+#include "misc.h"
 #include "optlist.h"
+#include "xy.h"
 
 /*
  * space-fill a map or radar scan;

diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index 01761bfcd43ac40583dd93fca72899c304857ab5..22ea872b6625820120b58337dc09761e42f1dced 100644 (file)
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -44,18 +44,20 @@
 #include <config.h>
 
 #include <assert.h>
+#include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
 #include <direct.h>
+#else
+#include <unistd.h>
 #endif
 
-#include "misc.h"
 #include "file.h"
+#include "misc.h"
 #include "optlist.h"
-#include "gen.h"
+#include "prototypes.h"
 
 /* Dummy one */
 static int emp_config_dummy;

diff --git a/src/lib/gen/getstarg.c b/src/lib/gen/getstarg.c
index 76275b23e6ce3bea25a96dd34e1d68a7765358b8..3309c0d9adf9522c0f6e44b476c78ec9242a49d4 100644 (file)
--- a/src/lib/gen/getstarg.c
+++ b/src/lib/gen/getstarg.c
@@ -33,8 +33,8 @@
 
 #include <config.h>
 
+#include <string.h>
 #include "misc.h"
-#include "gen.h"
 
 /*
  * Get string argument.

diff --git a/src/lib/gen/getstring.c b/src/lib/gen/getstring.c
index 7015d156cf29cb259d65687034147a19a3c09411..57a8d5eba443658ae9bbfb12135920e0214bb02c 100644 (file)
--- a/src/lib/gen/getstring.c
+++ b/src/lib/gen/getstring.c
@@ -33,9 +33,7 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "gen.h"
-#include "subs.h"
+#include "prototypes.h"
 
 /*
  * Print sub-prompt PROMPT, receive a line of input into BUF[1024].

diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c
index 76fd102505b533539ff346d0becc50150e38bd8a..89e8c048acdbd36e22af3f0f1cdb222236707eae 100644 (file)
--- a/src/lib/gen/io.c
+++ b/src/lib/gen/io.c
@@ -42,28 +42,25 @@
 #include <config.h>
 
 #include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include <sys/types.h>
-#if !defined(_WIN32)
+#ifdef _WIN32
+#define WIN32
+#include <winsock2.h>
+#undef NS_ALL
+#else
 #include <sys/uio.h>
 #include <sys/file.h>
-#include <unistd.h>            /* close read shutdown select */
 #include <sys/socket.h>
+#include <unistd.h>
 #endif
 #include <time.h>
-#include <fcntl.h>
-#include <stdlib.h>            /* malloc calloc free */
-
-#if defined(_WIN32)
-#define WIN32
-#include <winsock2.h>
-#undef NS_ALL
-#endif
 
+#include "empio.h"
+#include "ioqueue.h"
 #include "misc.h"
 #include "queue.h"
-#include "ioqueue.h"
-#include "empio.h"
-#include "gen.h"               /* getfdtablesize */
 #include "server.h"
 
 #include "empthread.h"

diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index b1791d315540ae51f1ccd4062de588386e065e65..5408d68e174ee7fdce18903ce9b4e5b3b86e7401 100644 (file)
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -41,13 +41,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <string.h>
 #if !defined(_WIN32)
 #include <sys/uio.h>
 #endif
+#include "ioqueue.h"
 #include "misc.h"
 #include "queue.h"
-#include "ioqueue.h"
 
 static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, int stopc);
 #if !defined(_WIN32)

diff --git a/src/lib/gen/mapdist.c b/src/lib/gen/mapdist.c
index 42da3b66795e48605449d040d9a0da2f92118b2a..ee01773bc01a5754dee29c2ff3b8080262a97a43 100644 (file)
--- a/src/lib/gen/mapdist.c
+++ b/src/lib/gen/mapdist.c
@@ -38,8 +38,8 @@
 #include <config.h>
 
 #include "misc.h"
-#include "gen.h"
 #include "optlist.h"
+#include "prototypes.h"
 
 int
 diffx(int x1, int x2)

diff --git a/src/lib/gen/numstr.c b/src/lib/gen/numstr.c
index 1f74f1a2a4f601f17be953f41c4a5390abad9906..3ac0e9880390b75c551e0481e55066c00349d278 100644 (file)
--- a/src/lib/gen/numstr.c
+++ b/src/lib/gen/numstr.c
@@ -33,9 +33,7 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "misc.h"
-#include "gen.h"
+#include "prototypes.h"
 
 char *
 numstr(char *buf, int n)

diff --git a/src/lib/gen/onearg.c b/src/lib/gen/onearg.c
index 83ed415772a357a9b83c731ea377dc59ea424b8a..5aaa79d12566909526157c4f7631607d7fb20ae4 100644 (file)
--- a/src/lib/gen/onearg.c
+++ b/src/lib/gen/onearg.c
@@ -33,8 +33,7 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "gen.h"
+#include "prototypes.h"
 
 int
 onearg(char *arg, char *prompt)

diff --git a/src/lib/gen/parse.c b/src/lib/gen/parse.c
index 7509df5234b0affe2c54096a73268201ab79ba4e..409c6f137fd37b4638a70b87d7293899c464a6fe 100644 (file)
--- a/src/lib/gen/parse.c
+++ b/src/lib/gen/parse.c
@@ -34,8 +34,7 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "misc.h"
-#include "gen.h"
+#include "prototypes.h"
 
 /*
  * Parse user command in BUF.

diff --git a/src/lib/gen/round.c b/src/lib/gen/round.c
index 7130ab71948d61ef9e263129ade597d20e490eb1..bda84344d89326aefd0f2e71094ea54b1411b608 100644 (file)
--- a/src/lib/gen/round.c
+++ b/src/lib/gen/round.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#include "gen.h"
+#include "prototypes.h"
 
 int
 roundintby(int n, int m)

diff --git a/src/lib/gen/scthash.c b/src/lib/gen/scthash.c
index a509e810d04215c87a724cf35695610309fcaab7..fbaa7b14c9cfa2438682c3b8bfa8527bb33645b0 100644 (file)
--- a/src/lib/gen/scthash.c
+++ b/src/lib/gen/scthash.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#include "gen.h"
+#include "prototypes.h"
 
 int
 scthash(int x, int y, int tsize)

diff --git a/src/lib/gen/service.c b/src/lib/gen/service.c
index 70ab73ba68f9cb591150bcbeaf30a50d6d145098..0c3e9078fdff385debac014f078314fb2d1f8a9a 100644 (file)
--- a/src/lib/gen/service.c
+++ b/src/lib/gen/service.c
@@ -36,9 +36,9 @@
 #ifdef _WIN32
 #include <windows.h>
 
+#include "optlist.h"
 #include "prototypes.h"
 #include "service.h"
-#include "optlist.h"
 
 int
 install_service(char *program_name, char *service_name, char *config_file)

diff --git a/src/lib/gen/tcp_listen.c b/src/lib/gen/tcp_listen.c
index 2b086035660a170217d4cc9c91c7c5d2a36fecf6..6b8691ba36e6f113c8bfa21fa88415f95fad60ba 100644 (file)
--- a/src/lib/gen/tcp_listen.c
+++ b/src/lib/gen/tcp_listen.c
@@ -36,18 +36,16 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #ifdef _WIN32
 #define WIN32
 #include "winsock2.h"
 #undef NS_ALL
 #else
-#include <sys/socket.h>
-#include <netdb.h>
 #include <arpa/inet.h>
+#include <netdb.h>
 #include <netinet/in.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #endif
 #include "prototypes.h"

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index 6773c42c7187b9265426c5fb3747494d5e82d422..51f4883d1c8b30bc82251cb125d23816391a0fda 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -34,26 +34,22 @@
 #include <config.h>
 
 #include <stddef.h>
-#include "misc.h"
-#include "xy.h"
+#include "commodity.h"
+#include "file.h"
+#include "land.h"
 #include "loan.h"
+#include "lost.h"
+#include "nat.h"
+#include "news.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "plane.h"
-#include "ship.h"
-#include "land.h"
+#include "power.h"
+#include "product.h"
 #include "sect.h"
+#include "ship.h"
 #include "trade.h"
 #include "treaty.h"
-#include "file.h"
-#include "power.h"
-#include "news.h"
-#include "nat.h"
-#include "lost.h"
-#include "product.h"
-
-#include "commodity.h"
-#include "nsc.h"
 
 /* Number of elements in ARRAY.  */
 #define SZ(array) (sizeof(array) / sizeof((array)[0]))

diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index d5bb82c6d722b60fd8d7ee37db01e7f27b1bb0c6..1b4c75c0c06919259bd6410b0b11fe83049e641e 100644 (file)
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -34,12 +34,13 @@
 
 #include <config.h>
 
+#include "land.h"
 #include "misc.h"
-#include "ship.h"
+#include "optlist.h"
 #include "plane.h"
 #include "product.h"
-#include "optlist.h"
 #include "prototypes.h"
+#include "ship.h"
 
 static void init_mchr(void);
 static void init_pchr(void);

diff --git a/src/lib/global/item.c b/src/lib/global/item.c
index 8aa717f0dc5f45ef256b360dbde77959f98d2fdd..92719082bf81836328024329ce4250980d3ce19c 100644 (file)
--- a/src/lib/global/item.c
+++ b/src/lib/global/item.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "item.h"
 
 /*

diff --git a/src/lib/global/land.c b/src/lib/global/land.c
index 9bd04baea9da36e59f36a2d588e97fa4ce17c978..4001fa4a1267ed8a1ea0e83bcc2eb02992569072 100644 (file)
--- a/src/lib/global/land.c
+++ b/src/lib/global/land.c
@@ -35,7 +35,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "land.h"
 
 /*

diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index 1774af60eae0b2c037ff623ca3e3ec7b738d4c79..c6216f9fc094e6f3287bcbcce522a068d236a3f2 100644 (file)
--- a/src/lib/global/news.c
+++ b/src/lib/global/news.c
@@ -41,9 +41,7 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "news.h"
-#include "nsc.h"
 
 static char no_news[] = "does nothing in particular to %s";
 

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index e0bff68a23dcc920e0f969f352aaef0788617148..7b015e1e0815ba39d758083e7afc3519aa4ef8a2 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -39,12 +39,10 @@
 #include <config.h>
 
 #include <stddef.h>
-#include "misc.h"
-#include "xy.h"
-#include "nsc.h"
 #include "empobj.h"
-#include "product.h"
 #include "file.h"
+#include "nsc.h"
+#include "product.h"
 
 #define fldoff(str, fld) offsetof(struct str, fld)
 

diff --git a/src/lib/global/nuke.c b/src/lib/global/nuke.c
index f8da09a6b5809fbc314b8621a1cd62595fc0f3d6..7856da4fd3197890b1a840798b619bb47ae5f1cb 100644 (file)
--- a/src/lib/global/nuke.c
+++ b/src/lib/global/nuke.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "nuke.h"
 
 /*

diff --git a/src/lib/global/plane.c b/src/lib/global/plane.c
index 4c1c29646ec2295f511a5d69669339ee54def613..b2842b79b11b0bcccd87bd69c22f33d9e9636d73 100644 (file)
--- a/src/lib/global/plane.c
+++ b/src/lib/global/plane.c
@@ -37,7 +37,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "plane.h"
 
 /*

diff --git a/src/lib/global/product.c b/src/lib/global/product.c
index eef142a9f4abd2d950d750dfd4a58fea0a3d4b0f..737daef8c08138aeefa65ff7a86e187515e9d13b 100644 (file)
--- a/src/lib/global/product.c
+++ b/src/lib/global/product.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "product.h"
 
 /*

diff --git a/src/lib/global/sect.c b/src/lib/global/sect.c
index 1aae43c3d17836c3520bedc94ccb89e9a5b7a126..97097b02775177965c8ebbaeebf4dfc5b461e1a5 100644 (file)
--- a/src/lib/global/sect.c
+++ b/src/lib/global/sect.c
@@ -37,7 +37,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "sect.h"
 
 /*

diff --git a/src/lib/global/ship.c b/src/lib/global/ship.c
index 436e4ed4e83918065c57f3d4c0d4034491d9e767..f9b8a0e0e79b227e2228dd8b77c546c9aa8fb26f 100644 (file)
--- a/src/lib/global/ship.c
+++ b/src/lib/global/ship.c
@@ -37,7 +37,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "ship.h"
 
 /*

diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c
index 5c7ab5d056a1ea515f55d8042ad2c23c7923656e..9cb421240205e61872c8f1b0f7daa981e4da0da6 100644 (file)
--- a/src/lib/global/symbol.c
+++ b/src/lib/global/symbol.c
@@ -34,11 +34,16 @@
 #include <config.h>
 
 #include "land.h"
+#include "misc.h"
 #include "mission.h"
+#include "nat.h"
 #include "news.h"
+#include "nsc.h"
 #include "nuke.h"
 #include "plague.h"
 #include "plane.h"
+#include "retreat.h"
+#include "sect.h"
 #include "ship.h"
 #include "treaty.h"
 

diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index d20a9e6172b9fd7937f33f9f5a36c1f8c75310d6..de10fbc4f344cf657f4d64c4038908ed673a9873 100644 (file)
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "lwp.h"
 #include "lwpint.h"

diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h
index 2f1edcd7c240ea80b1a4befcb3701a7e8993c4e6..e7cb65bc717318ef617ba3532dbb22fbb96003f7 100644 (file)
--- a/src/lib/lwp/lwpint.h
+++ b/src/lib/lwp/lwpint.h
@@ -35,12 +35,15 @@
 #ifndef LWPINT_H
 #define LWPINT_H
 
+#include <signal.h>
 #ifdef UCONTEXT
 #include <ucontext.h>
 #else  /* !UCONTEXT */
 #include <setjmp.h>
 #endif /* !UCONTEXT */
 
+#include "misc.h"
+
 /* process control block.  do *not* change the position of context */
 struct lwpProc {
 #ifdef UCONTEXT

diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c
index a9cf1c93cfc370fc7a93ef6aa8943b28c8a825ee..62bca68d263b8274568d3171a1ff931f7bbb4a82 100644 (file)
--- a/src/lib/lwp/sel.c
+++ b/src/lib/lwp/sel.c
@@ -34,9 +34,7 @@
 
 #include <config.h>
 
-#include <stdlib.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/file.h>
 #include <sys/time.h>

diff --git a/src/lib/lwp/sig.c b/src/lib/lwp/sig.c
index 9800a97ba603274476e9e868e97a2290d25b2cfa..104478e6633f220011dd04482fb7c0ab64437c90 100644 (file)
--- a/src/lib/lwp/sig.c
+++ b/src/lib/lwp/sig.c
@@ -35,7 +35,6 @@
 
 #include <errno.h>
 #include <signal.h>
-#include "misc.h"
 #include "lwp.h"
 #include "lwpint.h"
 

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 70bc49aa94bf6f6dc20efb5ba7f57b6df8f2f5d9..709a09223c1effd7b7a082de3f6aeede439fcab2 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -34,27 +34,13 @@
 
 #include <config.h>
 
-#if defined(_WIN32)
+#ifdef _WIN32
 #define WIN32
 #include <winsock2.h>
 #undef NS_ALL
-#endif
-
-#include "prototypes.h"
-#include "misc.h"
-#include "proto.h"
-#include "empthread.h"
-#include "player.h"
-#include "file.h"
-#include "empio.h"
-#include "power.h"
-#include "gen.h"
-#include "optlist.h"
-
-#if !defined(_WIN32)
+#else
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
@@ -63,9 +49,18 @@
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <stdio.h>
 
+#include "empio.h"
+#include "empthread.h"
+#include "file.h"
+#include "misc.h"
+#include "optlist.h"
+#include "player.h"
+#include "power.h"
+#include "proto.h"
+#include "prototypes.h"
+
 static struct emp_qelem Players;
 static int player_socket;
 static size_t player_addrlen;

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index 8eb6e6f1975d289cc02504dd7f86b493425336e5..ff6fa11715f35eff41e5fc8189ff0338673cfded 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -34,18 +34,16 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include "misc.h"
-#include "player.h"
 #include "com.h"
+#include "empio.h"
+#include "file.h"
 #include "match.h"
+#include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "proto.h"
-#include "empio.h"
 #include "optlist.h"
-#include "subs.h"
-#include "common.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 e286a7e3c8db7fb4de1f5edf27349de62eff56d6..cf2204eb3c3db90d479803e7de41539f1cafadf1 100644 (file)
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -35,20 +35,18 @@
 
 #include <config.h>
 
-#include "prototypes.h"
 #include <stdio.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "tel.h"
-#include "proto.h"
 #include "com.h"
-#include "file.h"
 #include "empio.h"
+#include "file.h"
 #include "match.h"
-#include "subs.h"
-#include "common.h"
+#include "misc.h"
+#include "nat.h"
 #include "optlist.h"
+#include "player.h"
+#include "proto.h"
+#include "prototypes.h"
+#include "tel.h"
 
 #include <fcntl.h>
 #include <time.h>

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index d9ff0e126410d969134725651a976714b93e0e64..aeadf9f29ea339cc7fab505d30da4cee27cb87d1 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -38,6 +38,7 @@
 #include <config.h>
 
 #include "com.h"
+#include "nat.h"
 #include "prototypes.h"
 
 struct cmndstr player_coms[] = {

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index adfd0978f1445da6aacf0123ea644b4db6798c50..102177b010ba1e3d9bf99bf3640f491eb0be62f8 100644 (file)
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.c
@@ -34,15 +34,13 @@
 
 #include <config.h>
 
-#include "prototypes.h"
+#include "file.h"
 #include "misc.h"
-#include "player.h"
-#include "sect.h"
 #include "nat.h"
-#include "file.h"
 #include "optlist.h"
-#include "common.h"
-#include "gen.h"
+#include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static int nat_cap(int);
 

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 411fffab192b87703e83e04291b64d173945d6b5..ade425515c162e364ebb64fe296bbe1287362211 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -35,27 +35,18 @@
 
 #include <config.h>
 
-#include <string.h>
-#include "prototypes.h"
-#include "misc.h"
-#include "proto.h"
-#include "player.h"
 #include "com.h"
-#include "empthread.h"
 #include "empio.h"
+#include "empthread.h"
+#include "file.h"
 #include "match.h"
-#include "nsc.h"
+#include "misc.h"
 #include "nat.h"
+#include "nsc.h"
 #include "optlist.h"
-#include "file.h"
-#include "subs.h"
-#include "common.h"
-#include "gen.h"
-
-#if !defined(_WIN32)
-#include <netinet/in.h>
-#endif
-#include <errno.h>
+#include "player.h"
+#include "proto.h"
+#include "prototypes.h"
 
 static int client_cmd(void);
 static int coun_cmd(void);

diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c
index dd5aa5dbbd73b6254da73a9cb6f8c38e0366a778..67819d948873ab2408423f70dad78ab3fcc80b92 100644 (file)
--- a/src/lib/player/nat.c
+++ b/src/lib/player/nat.c
@@ -33,12 +33,9 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include "misc.h"
-#include "nat.h"
 #include "file.h"
-#include "player.h"
-#include <fcntl.h>
+#include "nat.h"
+#include "prototypes.h"
 
 int
 natbyname(char *name, natid *result)

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index b3d4310ad8de2fdd18f584d3b1eb64f1c4821ffe..95af6d43bf7a8608e0496becbeb644d083747973 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -33,28 +33,23 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include <string.h>
+#include "com.h"
+#include "empio.h"
+#include "empthread.h"
+#include "file.h"
+#include "journal.h"
 #include "misc.h"
+#include "nat.h"
+#include "optlist.h"
 #include "player.h"
 #include "proto.h"
-#include "com.h"
-#include "nat.h"
-#include "sect.h"
-#include "file.h"
 #include "proto.h"
-#include "empio.h"
-#include "empthread.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "tel.h"
-#include "gen.h"
-#include "subs.h"
-#include "common.h"
-#include "optlist.h"
-#include "journal.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>
-#include <sys/time.h>
 #endif
 #include <stdio.h>
 #include <errno.h>

diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c
index a6c1d154c8deeb9b2acbcde7f02c368d112705d2..f356593de911480dc6cbc6ca100296c7f1b82ca2 100644 (file)
--- a/src/lib/player/recvclient.c
+++ b/src/lib/player/recvclient.c
@@ -33,13 +33,10 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include <stdio.h>
-#include "misc.h"
 #include "empio.h"
 #include "journal.h"
 #include "player.h"
-#include "empthread.h"
+#include "prototypes.h"
 
 /*
  * Receive a line of input from the current player.

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 520cf95b9cd928e989ba5443debeaa80c82487b0..842d8af9fd777367f9922e4d895e17c0d4171590 100644 (file)
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -36,23 +36,22 @@
 
 #include <config.h>
 
-#include <string.h>
-
-#include "misc.h"
-#include "player.h"
-#include "news.h"
+#include "file.h"
 #include "land.h"
-#include "sect.h"
-#include "plane.h"
-#include "ship.h"
+#include "map.h"
+#include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "xy.h"
+#include "news.h"
 #include "nsc.h"
+#include "optlist.h"
 #include "path.h"
+#include "plane.h"
+#include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "sect.h"
 #include "server.h"
+#include "ship.h"
+#include "xy.h"
 
 #define FLAK_GUN_MAX 14
 

diff --git a/src/lib/subs/askyn.c b/src/lib/subs/askyn.c
index ae5dff735fe847c89e03dde687026c0908ea05e0..8cfbec77a449e0fd6247ae837d18d72d43c7136a 100644 (file)
--- a/src/lib/subs/askyn.c
+++ b/src/lib/subs/askyn.c
@@ -34,8 +34,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include <fcntl.h>
 #include "prototypes.h"
 
 /*

diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c
index 4a5288f4c48ccfceaba31ba463cfa415ad78b107..9a759a1ec558d1c02a30ae5e4e778d263071ddc0 100644 (file)
--- a/src/lib/subs/aswplnsubs.c
+++ b/src/lib/subs/aswplnsubs.c
@@ -33,12 +33,12 @@
 
 #include <config.h>
 
-#include <stdlib.h>
-#include "misc.h"
 #include "file.h"
-#include "ship.h"
+#include "misc.h"
+#include "nat.h"
 #include "plane.h"
 #include "prototypes.h"
+#include "ship.h"
 
 int
 on_shiplist(short uid, struct shiplist *head)

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 8b823339c9b19d6042d2d41ad13bd503bb430168..ed6f0b592558cd139d2f411bbc1123497ca05547 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -35,25 +35,28 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <math.h>
-#include "misc.h"
-#include "player.h"
+#include "combat.h"
 #include "file.h"
+#include "item.h"
+#include "land.h"
+#include "lost.h"
+#include "map.h"
+#include "misc.h"
+#include "mission.h"
+#include "nat.h"
+#include "news.h"
+#include "nsc.h"
+#include "optlist.h"
+#include "path.h"
 #include "plague.h"
+#include "player.h"
+#include "prototypes.h"
 #include "sect.h"
 #include "ship.h"
-#include "path.h"
-#include "news.h"
 #include "treaty.h"
-#include "nat.h"
 #include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "combat.h"
-#include "item.h"
-#include "optlist.h"
-#include "prototypes.h"
 
 #define CASUALTY_LUMP  1       /* How big casualty chunks should be */
 

diff --git a/src/lib/subs/bigmap.c b/src/lib/subs/bigmap.c
index f972b3fe8a9cb56ca8c4439ae2212e916de49c2e..1723ca0ebf0873720f98b7b33b7a08cf08dce468 100644 (file)
--- a/src/lib/subs/bigmap.c
+++ b/src/lib/subs/bigmap.c
@@ -34,10 +34,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "file.h"
-#include "prototypes.h"
+#include "map.h"
+#include "sect.h"
 
 /* values of only_bmap:
  * 0 = update both maps

diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c
index 62f62f6e1ea8a0208100e7044263fd6a4ff97f6a..9bce2323c6b775941e5ea963fe0bbe274afa18cb 100644 (file)
--- a/src/lib/subs/border.c
+++ b/src/lib/subs/border.c
@@ -33,10 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "prototypes.h"
+#include "map.h"
 #include "optlist.h"
+#include "prototypes.h"
+#include "xy.h"
 
 void
 border(struct range *rp, char *prefstr, char *sep)

diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c
index 3d2fd1deb0f76afa9093d2783c8b5bd682de8515..18bd3720a4db66dc7cba82392fc0c9ed76251d3d 100644 (file)
--- a/src/lib/subs/bsanct.c
+++ b/src/lib/subs/bsanct.c
@@ -33,16 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "news.h"
-#include "path.h"
 #include "file.h"
+#include "news.h"
+#include "player.h"
 #include "prototypes.h"
+#include "sect.h"
 
 void
 bsanct(void)

diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c
index 69259e19f351a44ddc462e530ac6d11d571dcec5..66cf7e6fd3a3c6167b9816463cd88179042c72da 100644 (file)
--- a/src/lib/subs/caploss.c
+++ b/src/lib/subs/caploss.c
@@ -33,13 +33,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
+#include "commodity.h"
 #include "file.h"
+#include "loan.h"
+#include "nat.h"
 #include "news.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 
 void
 caploss(struct sctstr *sp, natid coun, char *msg)

diff --git a/src/lib/subs/chkmoney.c b/src/lib/subs/chkmoney.c
index 15771b82058aca3b19f7c40d6c2bdba37b19851f..5a9102375f846712a9327ef62a3024ae09d4d6c3 100644 (file)
--- a/src/lib/subs/chkmoney.c
+++ b/src/lib/subs/chkmoney.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "player.h"
 #include "prototypes.h"
 

diff --git a/src/lib/subs/cnumb.c b/src/lib/subs/cnumb.c
index d934d885db2ffca7019c1f417609946b22b64fbf..b6434fd72c9ffe990999f963c0e1a9792c6d887d 100644 (file)
--- a/src/lib/subs/cnumb.c
+++ b/src/lib/subs/cnumb.c
@@ -33,11 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
 #include "file.h"
 #include "match.h"
+#include "nat.h"
 #include "prototypes.h"
 
 /*

diff --git a/src/lib/subs/coastal.c b/src/lib/subs/coastal.c
index 7d1bce4d206a6d73f6c6c02f29b37b3501783e0e..721ef953fa5b5a4330fd4c727f90f91d854652ab 100644 (file)
--- a/src/lib/subs/coastal.c
+++ b/src/lib/subs/coastal.c
@@ -33,9 +33,10 @@
 
 #include <config.h>
 
-#include "prototypes.h"
 #include "file.h"
 #include "path.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void
 update_coastal_flag(struct sctstr *sp, struct sctstr *sectp)

diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index 41d13932a14cfce28501f306f3830d0cd4ef1f71..58c41c81b41ad30519e1e8a1010fa090c25592ef 100644 (file)
--- a/src/lib/subs/control.c
+++ b/src/lib/subs/control.c
@@ -33,17 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
 #include "file.h"
-#include "path.h"
-#include "xy.h"
 #include "land.h"
-#include "nsc.h"
-#include "item.h"
 #include "prototypes.h"
+#include "sect.h"
 
 /*
  * Does the player->owner have military control of this sector?

diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c
index 0290bd751a2bf074acdc99eff950a63c1d02cd25..b7a5308b9d44f7dade790cc478cdd4f7e5e19c98 100644 (file)
--- a/src/lib/subs/detonate.c
+++ b/src/lib/subs/detonate.c
@@ -33,20 +33,21 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nat.h"
 #include "file.h"
-#include "sect.h"
-#include "nuke.h"
-#include "ship.h"
 #include "land.h"
+#include "lost.h"
+#include "misc.h"
+#include "nat.h"
 #include "news.h"
-#include "plane.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"
+#include "xy.h"
 
 static void kaboom(int x, int y, int rad, natid cn);
 

diff --git a/src/lib/subs/disloan.c b/src/lib/subs/disloan.c
index 6d7e99620360617119552337bde71a62eead2b1e..7d87157c1e91226eee5bcd30b1c3e6aea9ff244b 100644 (file)
--- a/src/lib/subs/disloan.c
+++ b/src/lib/subs/disloan.c
@@ -46,11 +46,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
+#include "file.h"
 #include "loan.h"
 #include "nat.h"
-#include "file.h"
+#include "player.h"
 #include "prototypes.h"
 
 int

diff --git a/src/lib/subs/distrea.c b/src/lib/subs/distrea.c
index d0e6e2d459096e848d6ef02263a55b9e85c2ef6a..5dcd9f45c76aa84639e4dc91cf55a725f4146fc2 100644 (file)
--- a/src/lib/subs/distrea.c
+++ b/src/lib/subs/distrea.c
@@ -33,12 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "treaty.h"
-#include "nat.h"
 #include "file.h"
+#include "nat.h"
+#include "player.h"
 #include "prototypes.h"
+#include "treaty.h"
 
 int
 distrea(int n, struct trtstr *tp)

diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c
index 0ecb210294bc8e94e9c8e28e2a641df349d1c1d1..4b77e239f9e48e17c7d3ef8236d2b1232d0e1e40 100644 (file)
--- a/src/lib/subs/fortdef.c
+++ b/src/lib/subs/fortdef.c
@@ -39,17 +39,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
+#include "file.h"
 #include "nat.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
 #include "news.h"
-#include "nsc.h"
-#include "file.h"
 #include "optlist.h"
 #include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 
 #define        NOISY   1
 

diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c
index a66fab1f55622fc89f68fa0e2dcf969298c97a25..fdff4b2b8a512fbe147451793a145f04f257e6d3 100644 (file)
--- a/src/lib/subs/getbit.c
+++ b/src/lib/subs/getbit.c
@@ -33,16 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "nat.h"
-#include "prototypes.h"
 #include "optlist.h"
-
-
+#include "prototypes.h"
+#include "sect.h"
 
 /*
  *

diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c
index 483dc6856914685630d12c90711639a8f7e2aee4..009e354d98713f5d5e292a6221fdd5a4046ded65 100644 (file)
--- a/src/lib/subs/getele.c
+++ b/src/lib/subs/getele.c
@@ -33,11 +33,9 @@
 
 #include <config.h>
 
-#include <ctype.h>
-#include "misc.h"
 #include "player.h"
-#include "tel.h"
 #include "prototypes.h"
+#include "tel.h"
 
 static int tilde_escape(char *s);
 

diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c
index 688a19051ffc086886e5cbe41a96931e7bdcdb22..209bd7f670a37c3c98194de97a91f88d38241a62 100644 (file)
--- a/src/lib/subs/land.c
+++ b/src/lib/subs/land.c
@@ -33,15 +33,16 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "file.h"
 #include "land.h"
-#include "ship.h"
+#include "lost.h"
+#include "misc.h"
 #include "nsc.h"
+#include "optlist.h"
 #include "plane.h"
+#include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "ship.h"
 
 int
 lnd_postread(int n, void *ptr)

diff --git a/src/lib/subs/landgun.c b/src/lib/subs/landgun.c
index 745180e8528c3018a634d2ac3497af2de1ff24d3..a350adc3e61ce61e8be4a7eadf8365d13d5c1d3b 100644 (file)
--- a/src/lib/subs/landgun.c
+++ b/src/lib/subs/landgun.c
@@ -33,11 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "file.h"
 #include "nat.h"
 #include "optlist.h"
 #include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 
 double
 landgun(int effic, int guns)

diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index 016152c83a1a96bd5bc604358fca1dc39c46e80c..8d13262e5da2a4c23a0b68242f319aac9a8dfda9 100644 (file)
--- a/src/lib/subs/list.c
+++ b/src/lib/subs/list.c
@@ -33,16 +33,17 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
+#include <ctype.h>
+#include "file.h"
 #include "land.h"
-#include "plane.h"
+#include "misc.h"
 #include "nat.h"
-#include "xy.h"
 #include "nsc.h"
-#include "file.h"
+#include "plane.h"
+#include "player.h"
 #include "prototypes.h"
+#include "ship.h"
+#include "xy.h"
 
 int
 shipsatxy(coord x, coord y, int wantflags, int nowantflags)

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 6eaabbd78618ec1ca2a04c803d1d91febd3bea9a..352485648cc990294fd9834a1d8f0b7b882a9ae1 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -36,23 +36,24 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
+#include <stdlib.h>
+#include "combat.h"
+#include "damage.h"
 #include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "news.h"
-#include "nat.h"
-#include "xy.h"
 #include "land.h"
-#include "ship.h"
-#include "nsc.h"
+#include "misc.h"
 #include "mission.h"
-#include "plane.h"
-#include "combat.h"
-#include "damage.h"
+#include "nat.h"
+#include "news.h"
+#include "nsc.h"
 #include "optlist.h"
+#include "path.h"
+#include "plane.h"
+#include "player.h"
 #include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
 
 static void lnd_mess(char *, struct llist *);
 static int lnd_hit_mine(struct lndstr *, struct lchrstr *);

diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c
index a2750d888eed998efefbf55befbb4038fb4dfd83..d805764e01fdcf0f4c66161fdc990791c739ef8a 100644 (file)
--- a/src/lib/subs/lostsub.c
+++ b/src/lib/subs/lostsub.c
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "file.h"
-#include "land.h"
-#include "ship.h"
-#include "nsc.h"
 #include "lost.h"
-#include "prototypes.h"
 
 static int findlost(char, natid, short, coord, coord, int);
 

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 039a26ee9761d0bbc2ab7562a3d364c56d2641f2..7f8b1e064c9edd4090096c01713174867e9f6fc3 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -34,20 +34,20 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include "damage.h"
+#include "empobj.h"
+#include "file.h"
+#include "item.h"
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
+#include "mission.h"
 #include "nsc.h"
-#include "file.h"
+#include "optlist.h"
 #include "path.h"
-#include "mission.h"
-#include "item.h"
-#include <fcntl.h>
-#include "damage.h"
-#include "queue.h"
+#include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
-#include "empobj.h"
+#include "queue.h"
+#include "xy.h"
 
 struct genlist {
     struct emp_qelem queue;    /* list of units */

diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index 36245b35074c4a3b20a5902a86f4806f7aabbc69..190234b4ab364392e3a806857e0cc28e989aaf21 100644 (file)
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -33,18 +33,14 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "item.h"
+#include <ctype.h>
+#include "damage.h"
 #include "file.h"
-#include "xy.h"
-#include "path.h"
-#include "nat.h"
 #include "map.h"
-#include "nsc.h"
-#include "damage.h"
+#include "path.h"
+#include "player.h"
 #include "prototypes.h"
+#include "sect.h"
 
 static int move_map(coord curx, coord cury, char *arg);
 

diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index 4b9d3af08961bf37ad88db5487b79f532baf2f26..81e2107ab23ce239d942e9743085502a5afc37da 100644 (file)
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -34,22 +34,23 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "queue.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "optlist.h"
-#include "plane.h"
+#include <stdlib.h>
+#include "file.h"
 #include "land.h"
+#include "misc.h"
+#include "mission.h"
+#include "nat.h"
 #include "news.h"
-#include "xy.h"
 #include "nsc.h"
-#include "file.h"
-#include "nat.h"
+#include "optlist.h"
 #include "path.h"
-#include "mission.h"
+#include "plane.h"
+#include "player.h"
 #include "prototypes.h"
+#include "queue.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
 
 int
 msl_equip(struct plnstr *pp)

diff --git a/src/lib/subs/mtch.c b/src/lib/subs/mtch.c
index a02d5a3702b47e7f14a37b4fd6a97194b67df53a..e29d6fcc92f165af5344f078933cae149010f66a 100644 (file)
--- a/src/lib/subs/mtch.c
+++ b/src/lib/subs/mtch.c
@@ -33,8 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "com.h"
 #include "match.h"
 #include "prototypes.h"

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 099fd4e18ce81b8d07c5be1950a91c0f80c5e147..a19f996cfaa246077f9a214d806b2c28a85a5e2a 100644 (file)
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.c
@@ -34,13 +34,14 @@
 #include <config.h>
 
 #include <ctype.h>
+#include <stdlib.h>
+#include "file.h"
+#include "match.h"
 #include "misc.h"
 #include "nat.h"
+#include "optlist.h"
 #include "player.h"
-#include "file.h"
-#include "match.h"
 #include "prototypes.h"
-#include "optlist.h"
 
 /*
  * Get nation argument.

diff --git a/src/lib/subs/neigh.c b/src/lib/subs/neigh.c
index fec473b8b5aac77d22514e6cba404830611f830b..ee88f908c0bd56d479ee6df71f8f093be400fe6e 100644 (file)
--- a/src/lib/subs/neigh.c
+++ b/src/lib/subs/neigh.c
@@ -33,12 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "path.h"
 #include "file.h"
-#include "nat.h"
+#include "path.h"
 #include "prototypes.h"
+#include "sect.h"
 
 int
 neigh(coord x, coord y, natid own)

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index 8ab80f435f5574cde0b7b8e990486fea0eaa8c6f..f4f997b677c94d1be67e2cbbdc3e2ddd9bd78bc6 100644 (file)
--- a/src/lib/subs/nreport.c
+++ b/src/lib/subs/nreport.c
@@ -35,10 +35,11 @@
 
 #include <config.h>
 
-#include "prototypes.h"
-#include "news.h"
 #include "file.h"
+#include "nat.h"
+#include "news.h"
 #include "optlist.h"
+#include "prototypes.h"
 
 #define SLOTS  5
 

diff --git a/src/lib/subs/nstr.c b/src/lib/subs/nstr.c
index 21d1a5f28223447b13c0cb2bc91b6af1faba74b0..734531b82146f6e365a273007679dedc25c195b6 100644 (file)
--- a/src/lib/subs/nstr.c
+++ b/src/lib/subs/nstr.c
@@ -35,12 +35,13 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include <limits.h>
-#include "misc.h"
 #include "file.h"
 #include "match.h"
-#include "nsc.h"
+#include "nat.h"
 #include "optlist.h"
+#include "player.h"
 #include "prototypes.h"
 
 static char *nstr_parse_val(char *, struct valstr *);

diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c
index 0d08cbf44667888278abaa5ecc5a9c119a97a3cf..2363d111214ca48f296686c2e23b9e48fd7152a3 100644 (file)
--- a/src/lib/subs/nuke.c
+++ b/src/lib/subs/nuke.c
@@ -35,15 +35,17 @@
 
 #include <config.h>
 
+#include "file.h"
+#include "lost.h"
 #include "misc.h"
-#include "player.h"
+#include "nat.h"
+#include "nsc.h"
 #include "nuke.h"
+#include "plane.h"
+#include "player.h"
+#include "prototypes.h"
 #include "sect.h"
 #include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "prototypes.h"
 
 int
 nuk_postread(int n, void *ptr)

diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 0e0517cfe8f21e6f2880b405563e1aad4fdca489..c6884ca614954c4a3e08572cf352c2e4b20bf49b 100644 (file)
--- a/src/lib/subs/nxtitem.c
+++ b/src/lib/subs/nxtitem.c
@@ -33,14 +33,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "ship.h"
+#include "empobj.h"
+#include "file.h"
 #include "land.h"
+#include "misc.h"
 #include "nsc.h"
-#include "file.h"
+#include "player.h"
 #include "prototypes.h"
+#include "ship.h"
+#include "xy.h"
 
 int
 nxtitem(struct nstr_item *np, void *ptr)

diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c
index 7a9c2925664aaf5232b4dd9de250e2f73ff98922..34289df29f8f1ba4526038a5a483f27d4b000766 100644 (file)
--- a/src/lib/subs/nxtsct.c
+++ b/src/lib/subs/nxtsct.c
@@ -33,13 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
 #include "file.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "prototypes.h"
+#include "sect.h"
 
 /*
  * get the next sector in the range

diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c
index e94cadc8157e05ebed9639495a8972743234deed..a14e835ee1f70922b808c3b4ca8d8bd3b7932f19 100644 (file)
--- a/src/lib/subs/paths.c
+++ b/src/lib/subs/paths.c
@@ -33,14 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "path.h"
-#include "nat.h"
-#include "sect.h"
 #include "file.h"
+#include "path.h"
+#include "player.h"
 #include "prototypes.h"
+#include "sect.h"
 
 int
 chkdir(char dir_char, int min_dir, int max_dir)

diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c
index 5d44fa9a608820ec52f941ab53d20f4edf474957..a3e52a094f9ed8681b6eaffa5d33d0e35eb65106 100644 (file)
--- a/src/lib/subs/plane.c
+++ b/src/lib/subs/plane.c
@@ -34,14 +34,16 @@
 
 #include <config.h>
 
+#include "file.h"
+#include "land.h"
+#include "lost.h"
 #include "misc.h"
-#include "player.h"
+#include "nuke.h"
+#include "optlist.h"
 #include "plane.h"
-#include "ship.h"
-#include "land.h"
-#include "file.h"
+#include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "ship.h"
 
 int
 pln_postread(int n, void *ptr)

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index 9830db811ed9cce50c370963a8d37539cbb234eb..e1720da89b86b93df8c8c8f58dca3b4186a0e944 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -37,20 +37,23 @@
 #include <config.h>
 
 #include <math.h>
+#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"
 #include "sect.h"
 #include "ship.h"
-#include "land.h"
-#include "item.h"
-#include "plane.h"
 #include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
-#include "prototypes.h"
-#include "optlist.h"
 
 static int pln_equip(struct plist *, struct ichrstr *, int, char);
 

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index b2b04395241a6976cb83863c60220ade0bf33b75..b4ba412129d176958d4c9c09fc4d5a9914867347 100644 (file)
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -51,20 +51,20 @@
 
 #include <config.h>
 
-#include <string.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdarg.h>
-#include "proto.h"
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
+#include <stdlib.h>
+#include "com.h"
 #include "empio.h"
 #include "file.h"
-#include "com.h"
-#include "tel.h"
-#include "server.h"
+#include "misc.h"
+#include "nat.h"
+#include "player.h"
+#include "proto.h"
 #include "prototypes.h"
+#include "server.h"
+#include "tel.h"
 
 static void pr_player(struct player *pl, int id, char *buf);
 static void upr_player(struct player *pl, int id, char *buf);

diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c
index 516c2386dc99690135dec85b5ceaa38481c45f24..d5118fe84823d384459fb614fd4e8d27ed1f531f 100644 (file)
--- a/src/lib/subs/radmap.c
+++ b/src/lib/subs/radmap.c
@@ -33,17 +33,19 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include "file.h"
+#include "map.h"
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
 #include "nat.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
-#include "file.h"
 #include "nsc.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "plane.h"
+#include "player.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
 
 static void radmap2(int, int, int, int, int, double, int);
 

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index 66f91ed1f234b2ea987bae2bd77204a14d6ce987..566e1bd6aa919c29e0bec8d338c38e77ba74ede7 100644 (file)
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -33,13 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
 #include "file.h"
+#include "nat.h"
 #include "news.h"
+#include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
 #include "server.h"
 
 int

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 940afba2865eeb9ece60e5d5c7cc8d84e683c212..f657f4bd2f509a8788f29e97fddbdc85bc9a6cd3 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -33,22 +33,23 @@
 
 #include <config.h>
 
-#include <string.h>
+#include <stdlib.h>
+#include "damage.h"
+#include "file.h"
+#include "land.h"
+#include "map.h"
 #include "misc.h"
-#include "player.h"
 #include "nat.h"
-#include "retreat.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
 #include "news.h"
-#include "xy.h"
 #include "nsc.h"
+#include "optlist.h"
 #include "path.h"
-#include "file.h"
-#include "damage.h"
+#include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "retreat.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
 
 static int findcondition(char);
 static int retreat_land1(struct lndstr *, char, int);

diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c
index e42c604dc2e7e7fa52ceb813fe44d0148e033fbb..9ccf7b04e7ff7453196e89ff1db9ba669f5bff70 100644 (file)
--- a/src/lib/subs/sarg.c
+++ b/src/lib/subs/sarg.c
@@ -35,15 +35,15 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <string.h>
+#include <stdlib.h>
+#include "file.h"
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
 #include "nat.h"
-#include "file.h"
-#include "prototypes.h"
+#include "nsc.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
+#include "xy.h"
 
 /*
  * returns one of

diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index b1167692085bdf6cb7b45de99331c4a057bca32f..1f45c7e02d091436ab82e55efdbef3b7f0e3cf3b 100644 (file)
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -33,18 +33,20 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include "file.h"
+#include "land.h"
+#include "map.h"
 #include "misc.h"
+#include "nat.h"
+#include "nsc.h"
+#include "optlist.h"
+#include "plane.h"
 #include "player.h"
-#include "xy.h"
+#include "prototypes.h"
 #include "sect.h"
 #include "ship.h"
-#include "land.h"
-#include "plane.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "prototypes.h"
-#include "optlist.h"
+#include "xy.h"
 
 static char **rad;
 static char *radbuf;

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index ffc235a54c9c82b57d332abd0209bc7871b78473..72ce7e7926ce1093da5ffa6eb10dc56ab128afdd 100644 (file)
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.c
@@ -34,17 +34,19 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nat.h"
+#include <ctype.h>
 #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 "optlist.h"
+#include "sect.h"
+#include "xy.h"
 
 static int checksect(struct sctstr *);
 

diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 4acf860feafb140d24ffab187118a12443aada69..5b0b045864c9b8a8a27ad793868b1f28069426c4 100644 (file)
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -34,15 +34,16 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "file.h"
-#include "ship.h"
 #include "land.h"
-#include "plane.h"
+#include "lost.h"
+#include "misc.h"
 #include "nsc.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "plane.h"
+#include "player.h"
+#include "prototypes.h"
+#include "ship.h"
 
 int
 shp_postread(int n, void *ptr)

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 09a76fd85bfa0fcc38b0d6bebab69c8eae8e5bd5..1fab305303c68c4eec3431b386dbf38928374c4a 100644 (file)
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -38,20 +38,19 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "ship.h"
-#include "land.h"
-#include "item.h"
-#include "plane.h"
-#include "sect.h"
-#include "optlist.h"
 #include "file.h"
+#include "item.h"
+#include "land.h"
 #include "nat.h"
-#include "prototypes.h"
-#include "nsc.h"
 #include "news.h"
+#include "nuke.h"
+#include "optlist.h"
+#include "plane.h"
+#include "player.h"
+#include "product.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 
 struct look_list {
     union {

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 4cfce330b1d9e515a853e99d930c73366ad51d06..bf5f878346efaa77d276900827bb8140daa29062 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -36,25 +36,27 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "queue.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
+#include <stdlib.h>
+#include "damage.h"
+#include "file.h"
+#include "item.h"
 #include "land.h"
+#include "map.h"
+#include "misc.h"
+#include "mission.h"
+#include "nat.h"
 #include "news.h"
-#include "item.h"
-#include "xy.h"
 #include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
-#include "mission.h"
 #include "optlist.h"
-#include "damage.h"
-#include "server.h"
+#include "path.h"
+#include "plane.h"
+#include "player.h"
 #include "prototypes.h"
+#include "queue.h"
+#include "sect.h"
+#include "server.h"
+#include "ship.h"
+#include "xy.h"
 
 static int shp_check_one_mines(struct mlist *);
 static int shp_hit_mine(struct shpstr *, struct mchrstr *);

diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c
index 4b8e5a8db6f0850a5ddd525e574676009fe1d548..709f97781c48c1404a44c5a3d3e9ecd6b576bdd7 100644 (file)
--- a/src/lib/subs/snxtitem.c
+++ b/src/lib/subs/snxtitem.c
@@ -33,6 +33,7 @@
 
 #include <config.h>
 
+#include <ctype.h>
 #include "misc.h"
 #include "player.h"
 #include "xy.h"

diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index 75dbedb14638299592d03879aff224429432252f..83781c7fe9259ba2fe28711c668d623e94407648 100644 (file)
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.c
@@ -33,13 +33,14 @@
 
 #include <config.h>
 
+#include "file.h"
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
+#include "nat.h"
 #include "nsc.h"
-#include "file.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
+#include "xy.h"
 
 /*
  * setup the nstr_sect structure for sector selection.

diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index 6384cc924c6c8c841aed4390ea67ea6c1d63fd0f..74caa77c0198f82e652bba7c0c80ffa037aef26b 100644 (file)
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -34,19 +34,14 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "nat.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
-#include "item.h"
 #include "file.h"
+#include "land.h"
+#include "nat.h"
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 
 static int get_minimum(struct lndstr *, i_type);
 static int s_commod(int, int, int, i_type, int, int);

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index aed1ccece08d02afc6fa7bfea7e11057531d4df3..6b084e69c11570375333b7c2b8e6730ed5c868da 100644 (file)
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -34,17 +34,19 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include "file.h"
+#include "land.h"
+#include "lost.h"
 #include "misc.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
 #include "nat.h"
+#include "nsc.h"
+#include "optlist.h"
 #include "plane.h"
-#include "land.h"
-#include "ship.h"
-#include "file.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
 
 void
 takeover(struct sctstr *sp, natid newown)

diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index 96aa2d902d8f375c17ff87daf72d2b1afb5254c1..b9851d99e9bbf9e6738d90e3fa81713c048edab3 100644 (file)
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -35,22 +35,23 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
+#include "empobj.h"
+#include "file.h"
 #include "item.h"
-#include "ship.h"
 #include "land.h"
+#include "loan.h"
+#include "misc.h"
+#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"
 #include "trade.h"
 #include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "loan.h"
-#include "prototypes.h"
-#include "optlist.h"
 
 int
 trade_check_ok(struct trdstr *tp, union empobj_storage *tgp)

diff --git a/src/lib/subs/trechk.c b/src/lib/subs/trechk.c
index 6ab78d5e150c74f6ed4550554e682d071cb679f9..aaf6e2b66b98ee5c55bbb7afd9b31818a832d4b8 100644 (file)
--- a/src/lib/subs/trechk.c
+++ b/src/lib/subs/trechk.c
@@ -41,15 +41,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "treaty.h"
+#include "file.h"
 #include "nat.h"
 #include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "prototypes.h"
+#include "treaty.h"
 
 int
 trechk(natid actor, natid victim, int provision)

diff --git a/src/lib/subs/whatitem.c b/src/lib/subs/whatitem.c
index 7ce6b0f7e35b764c61461de76ed25f1e41165e5e..a5edc16344539231bf1ad04243b602a60d91f987 100644 (file)
--- a/src/lib/subs/whatitem.c
+++ b/src/lib/subs/whatitem.c
@@ -33,8 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "item.h"
 #include "prototypes.h"
 
 /*

diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c
index aa240ac830458e1a0976441ba6685532c4006337..f495387a2b1aefe958f30884cc8334d038ab7a52 100644 (file)
--- a/src/lib/subs/wu.c
+++ b/src/lib/subs/wu.c
@@ -29,24 +29,25 @@
  * 
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     
  */
 
 #include <config.h>
 
-#include <stdarg.h>
-#include "misc.h"
 #include <fcntl.h>
+#include <stdarg.h>
+#include <stdlib.h>
 #if !defined(_WIN32)
+#include <unistd.h>
 #include <sys/uio.h>
 #endif
-#include "nat.h"
-#include "tel.h"
 #include "file.h"
-#include "player.h"
-#include "server.h"
+#include "misc.h"
+#include "nat.h"
 #include "optlist.h"
+#include "player.h"
 #include "prototypes.h"
+#include "server.h"
+#include "tel.h"
 
 static struct telstr last_tel[MAXNOC];
 

diff --git a/src/lib/update/age.c b/src/lib/update/age.c
index 8b6ee2ad58f579e9cf7eb81667964e278ad20eb4..066f6d59d7004d64678aa4ad28aafb6902bfdac5 100644 (file)
--- a/src/lib/update/age.c
+++ b/src/lib/update/age.c
@@ -33,12 +33,7 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
 #include "update.h"
-#include "gen.h"
-#include "optlist.h"
 
 void
 age_levels(int etu)

diff --git a/src/lib/update/anno.c b/src/lib/update/anno.c
index 806fdf286de60a14e73dcb750c16eca61518b125..b374a7e3efc829d74b4478cf7c09dfd5f3d5bbd2 100644 (file)
--- a/src/lib/update/anno.c
+++ b/src/lib/update/anno.c
@@ -36,17 +36,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "tel.h"
-#include <fcntl.h>
 #include <stdio.h>
 #include <time.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
+#include "tel.h"
 #include "update.h"
-#include "optlist.h"
-#include "common.h"
 
 static int copy_and_expire(FILE *annfp, FILE *tmpfp,
                           char *tmp_filename, time_t expiry_time);

diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c
index 05c88b3c9a6a0d71025eced7718bd67e18da2d39..a106bd9cf00e4b56b504841f41d77f2b6762ce11 100644 (file)
--- a/src/lib/update/bp.c
+++ b/src/lib/update/bp.c
@@ -33,13 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "sect.h"
 #include "budg.h"
 #include "update.h"
-#include "common.h"
-#include "optlist.h"
 
 static int bud_key[I_MAX + 2] =
     { 1, 2, 3, 4, 0, 0, 0, 0, 0, 0, 5, 6, 0, 0, 7 };

diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 4a99b1474079d6631c747870ed92c05e48e1a9f7..9f264ee3107e2486aa5ca9523cde7eb155d3bd34 100644 (file)
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -33,16 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
 #include "item.h"
 #include "path.h"
-#include "file.h"
-#include "xy.h"
+#include "plague.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
 
 #define DELIVER_BONUS 4.0
 

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index 5fcc950648ca4ee27861686a234d4f92d9ce7234..e3d9f1df7f38b437ada9c18d27ca43bcd6f729e8 100644 (file)
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -34,20 +34,12 @@
 
 #include <config.h>
 
-#include <stdlib.h>
-#include "misc.h"
-#include "plague.h"
-#include "nat.h"
-#include "sect.h"
+#include "distribute.h"
 #include "item.h"
-#include "xy.h"
 #include "path.h"
-#include "file.h"
-#include "distribute.h"
-#include "update.h"
-#include "subs.h"
-#include "common.h"
+#include "plague.h"
 #include "prototypes.h"
+#include "update.h"
 
 #define EXPORT_BONUS 10.0
 #define IMPORT_BONUS 10.0

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index 785faa3dc65dd506953c421b035baec1317ab01b..d5d8c27cc3a0793a9fa24b436cc2884116a773be 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -35,16 +35,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "path.h"
 #include "distribute.h"
+#include "path.h"
 #include "update.h"
-#include "common.h"
-#include "optlist.h"
+#include <stdlib.h>
 
 /* Used for building up distribution info */
 struct distinfo {

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index 31d1271b4dfbea974d19655c1e481621b49e1b43..2cb08f1147d98a803b50e294d70ed4286dfa396d 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -35,20 +35,13 @@
 
 #include <config.h>
 
-#include <math.h>
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include "budg.h"
 #include "item.h"
 #include "news.h"
-#include "xy.h"
-#include "optlist.h"
-#include "budg.h"
 #include "player.h"
 #include "update.h"
-#include "common.h"
-#include "gen.h"
-#include "subs.h"
+#include "xy.h"
+#include <math.h>
 
 static int growfood(struct sctstr *, short *, int, int);
 static int starve_some(short *, i_type, int);

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 2fbab61a053f6b776a932f17e7d4966c5e6ebf93..7bb8a64ca0abdcee83e288b42a5a24d918b67e03 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -36,24 +36,15 @@
 
 #include <config.h>
 
-#include <math.h>
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
+#include "budg.h"
 #include "land.h"
-#include "ship.h"
+#include "lost.h"
 #include "news.h"
-#include "file.h"
-#include "optlist.h"
-#include "budg.h"
+#include "plague.h"
 #include "player.h"
+#include "ship.h"
 #include "update.h"
-#include "lost.h"
-#include "common.h"
-#include "subs.h"
-#include "common.h"
-#include "gen.h"
+#include <math.h>
 
 static void landrepair(struct lndstr *, struct natstr *, int *, int);
 static void upd_land(struct lndstr *, int, struct natstr *, int *, int);

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 3339ef1bf43bb2498a744af4cfdaa5d97d7b2231..a5abb88df2ed55eab294329a76798b3741cae936 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -35,23 +35,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
-#include "sect.h"
-#include "player.h"
-#include "empthread.h"
 #include "budg.h"
-#include "player.h"
-#include "update.h"
-#include "common.h"
-#include "optlist.h"
+#include "empthread.h"
 #include "journal.h"
+#include "player.h"
 #include "server.h"
-#include <stdlib.h>
-#if !defined(_WIN32)
-#include <sys/time.h>
-#endif
+#include "update.h"
 
 long money[MAXNOC];
 long pops[MAXNOC];

diff --git a/src/lib/update/material.c b/src/lib/update/material.c
index 1777cfcd9182e41562878d1f894cf29518cecba5..19f5483b7ce812b1ffcd8b808e85b3f855b9b5a6 100644 (file)
--- a/src/lib/update/material.c
+++ b/src/lib/update/material.c
@@ -33,13 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
 #include "budg.h"
 #include "player.h"
 #include "update.h"
-#include "common.h"
-#include "subs.h"
 
 void
 get_materials(struct sctstr *sp, int *bp, int *mvec, int check)

diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c
index fbacfd9f6320a07e728994807a238ba9bb3b46fe..9310deaa63950c35805b7815761347c7e7274f3c 100644 (file)
--- a/src/lib/update/mobility.c
+++ b/src/lib/update/mobility.c
@@ -34,19 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "ship.h"
 #include "land.h"
 #include "plane.h"
-#include "nat.h"
-#include "file.h"
-#include "optlist.h"
-#include "update.h"
-#include "gen.h"
-#include "subs.h"
-#include "optlist.h"
 #include "server.h"
+#include "ship.h"
+#include "update.h"
 
 
 int updating_mob = 1;

diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c
index f856b3d198c9bbe63c2d40ce084722251d3c6312..5aac82150d4947f01c55976e4b3ecf139f969a6e 100644 (file)
--- a/src/lib/update/move_sat.c
+++ b/src/lib/update/move_sat.c
@@ -34,17 +34,10 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "plane.h"
-#include "sect.h"
-#include "xy.h"
 #include "nsc.h"
-#include "nat.h"
 #include "path.h"
-#include "file.h"
+#include "plane.h"
 #include "update.h"
-#include "subs.h"
-#include "optlist.h"
 
 #ifndef PI
 #define        PI      3.14159265358979323846

diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index 746a43f61a4c3cb87c1b2fc94720e9a9f47cf3b2..7bc0467aaa8ebb6522d3f11db3d978c36ae03bc5 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -35,16 +35,9 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include "budg.h"
 #include "item.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
 #include "update.h"
-#include "subs.h"
-#include "budg.h"
 
 /*
  * hap and edu avg mean that the weight on current happiness is

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index 22211700f470b659e715e1510c86330e1250c707..c0b72b41af383dddba8fb07a88773714c20f7d4b 100644 (file)
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.c
@@ -34,23 +34,13 @@
 
 #include <config.h>
 
-#include "misc.h"
 
 #include <ctype.h>
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
+#include "item.h"
 #include "nsc.h"
-#include "nat.h"
 #include "path.h"
-#include "file.h"
-#include "item.h"
-#include "optlist.h"
-#include "player.h"
+#include "ship.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
-#include <stdlib.h>
 
 static void swap(struct shpstr *);
 

diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c
index 3171e83a44fbb15fa79889f0d836c3053d688fe7..206f9058f95ced072bca71cca182e27cb492737c 100644 (file)
--- a/src/lib/update/nav_util.c
+++ b/src/lib/update/nav_util.c
@@ -33,26 +33,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-
 #include <ctype.h>
-#include "plague.h"
-#include "ship.h"
-#include "plane.h"
+#include "item.h"
 #include "land.h"
-#include "sect.h"
-#include "xy.h"
 #include "nsc.h"
-#include "nat.h"
 #include "path.h"
-#include "file.h"
-#include "item.h"
-#include "optlist.h"
-#include "player.h"
+#include "plague.h"
+#include "plane.h"
+#include "ship.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
-#include "gen.h"
 
 /* load a specific ship given its 
  * location and what field to modify.

diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index 2d9896c872f5947858a8e4bcca538274760968ca..25e719943483cadc57e831612bcb8b8065c9aee7 100644 (file)
--- a/src/lib/update/nxtitemp.c
+++ b/src/lib/update/nxtitemp.c
@@ -33,16 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "ship.h"
+#include "empobj.h"
 #include "land.h"
 #include "nsc.h"
-#include "file.h"
-#include "player.h"
+#include "ship.h"
 #include "update.h"
-#include "gen.h"
-#include "common.h"
 
 void *
 nxtitemp(struct nstr_item *np)

diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c
index f117588a3acaae25f406607c80d617a8159aef17..4429d06d2a51658a0d4538332e7e181cf082d51b 100644 (file)
--- a/src/lib/update/plague.c
+++ b/src/lib/update/plague.c
@@ -33,20 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
 #include "item.h"
+#include "lost.h"
 #include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
+#include "plague.h"
 #include "update.h"
-#include "common.h"
-#include "subs.h"
-#include "lost.h"
-#include "gen.h"
 
 static int infect_people(struct natstr *, struct sctstr *);
 

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index a155e7bd4d2de1f6b2a1a68e363492f7db18db9c..c588ba55231b568888f91331806e2d20adb2dc94 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -35,20 +35,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "plane.h"
-#include "ship.h"
-#include "nat.h"
-#include "file.h"
-#include "optlist.h"
 #include "budg.h"
+#include "lost.h"
+#include "plane.h"
 #include "player.h"
+#include "ship.h"
 #include "update.h"
-#include "lost.h"
-#include "subs.h"
-#include "common.h"
-#include "gen.h"
 
 static void planerepair(struct plnstr *, struct natstr *, int *, int);
 static void upd_plane(struct plnstr *, int, struct natstr *, int *, int);

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index 1058a929e994555dc5bc06b8ca102eee2c7d922d..f5bcfeaf1385bc56f192fb4b45177374b4b6130a 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -33,18 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
-#include "file.h"
-#include "path.h"
-#include "xy.h"
 #include "land.h"
-#include "update.h"
-#include "subs.h"
-#include "gen.h"
-#include "common.h"
 #include "lost.h"
+#include "path.h"
+#include "update.h"
 
 void
 populace(struct natstr *np, struct sctstr *sp, int etu)

diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c
index 702b6d88d06e715bc00c00deed6b0ed08a3f1a77..26652579a08bed0675fea6baf68516b64d75f314 100644 (file)
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.c
@@ -35,21 +35,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include "budg.h"
 #include "item.h"
-#include "file.h"
-#include "xy.h"
+#include "land.h"
 #include "path.h"
-#include "optlist.h"
-#include "budg.h"
 #include "player.h"
 #include "ship.h"
-#include "land.h"
 #include "update.h"
-#include "gen.h"
-#include "common.h"
 
 void
 prepare_sects(int etu, int *bp)

diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c
index ae7b20778c759ed8343ef0d186bf8a161a126f3c..d863a6ef22a8c0d92b0bd4f1bfbfc9022d3b9b26 100644 (file)
--- a/src/lib/update/produce.c
+++ b/src/lib/update/produce.c
@@ -33,18 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
-#include "xy.h"
+#include "budg.h"
 #include "player.h"
+#include "product.h"
 #include "update.h"
-#include "gen.h"
-#include "subs.h"
-#include "common.h"
-#include "optlist.h"
-#include "budg.h"
 
 static void materials_charge(struct pchrstr *, short *, int);
 static int materials_cost(struct pchrstr *, short *, int *);

diff --git a/src/lib/update/removewants.c b/src/lib/update/removewants.c
index a1b15e621356240438d83011ee3e1197edc8f04d..316d1544621e152ff4455e86901226ed435222d8 100644 (file)
--- a/src/lib/update/removewants.c
+++ b/src/lib/update/removewants.c
@@ -33,9 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
 #include "update.h"
 
 int

diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 3f613ee3b4ca098ad353948a92e6c883239a3715..b26c71ad8d3640a917a7ea06fec820efa5b58953 100644 (file)
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -34,21 +34,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "file.h"
-#include "path.h"
-#include "xy.h"
 #include "land.h"
+#include "lost.h"
+#include "news.h"
 #include "nsc.h"
+#include "path.h"
 #include "plane.h"
 #include "update.h"
-#include "common.h"
-#include "gen.h"
-#include "lost.h"
-#include "subs.h"
 
 static void take_casualties(struct sctstr *, int);
 

diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index 1f746087d6d06a1db5a8a184dcd9957f2d928f4d..66bea91b7f19cce5cd45335ba3052e18d2de8f8e 100644 (file)
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -36,19 +36,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
+#include <math.h>
+#include "nsc.h"
 #include "path.h"
 #include "ship.h"
-#include "file.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
-#include <math.h>
-#include <stdlib.h>
 
 static void fltp_to_list(struct fltheadstr *, struct emp_qelem *);
 

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index f25f7e5afaaf6ed8f525697216fc034f448dd0c4..f0105ac8399c4c4161e669e956198d67492257ec 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -34,24 +34,15 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include "budg.h"
 #include "item.h"
-#include "file.h"
-#include "xy.h"
+#include "land.h"
+#include "lost.h"
 #include "path.h"
-#include "product.h"
-#include "optlist.h"
-#include "budg.h"
 #include "player.h"
-#include "land.h"
+#include "product.h"
 #include "ship.h"
 #include "update.h"
-#include "subs.h"
-#include "common.h"
-#include "lost.h"
-#include "gen.h"
 
 /*
  * Increase sector efficiency if old type == new type.

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 5c2f5a8e04792ded20dc6704e5ae276f7f938d54..1d4b93ecde03031038e44bbc27760184be8214c4 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -37,25 +37,15 @@
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
-#include "news.h"
-#include "file.h"
-#include "product.h"
+#include "budg.h"
 #include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "optlist.h"
+#include "lost.h"
+#include "news.h"
+#include "plague.h"
 #include "player.h"
+#include "product.h"
+#include "ship.h"
 #include "update.h"
-#include "common.h"
-#include "subs.h"
-#include "gen.h"
-#include "lost.h"
-#include "budg.h"
 
 static void shiprepair(struct shpstr *, struct natstr *, int *, int);
 static void upd_ship(struct shpstr *, int, struct natstr *, int *, int);

diff --git a/src/server/idle.c b/src/server/idle.c
index b6714287e6c729045efd171f76bbee33f0acbf74..e368fb2adad9b7e64f493845a0d8921c0f54b3f6 100644 (file)
--- a/src/server/idle.c
+++ b/src/server/idle.c
@@ -34,12 +34,10 @@
 #include <config.h>
 
 #include <time.h>
-#include "misc.h"
-#include "player.h"
-#include "empio.h"
 #include "empthread.h"
-#include "prototypes.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
 #include "server.h"
 
 /*ARGSUSED*/

diff --git a/src/server/lostitem.c b/src/server/lostitem.c
index bd4b7218347b32d91ebfc9c432af7c6567ba0e7b..d5be0c1f95249eb7cd27a00a31cbbdc04d1f1f67 100644 (file)
--- a/src/server/lostitem.c
+++ b/src/server/lostitem.c
@@ -33,12 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "empthread.h"
 #include "file.h"
 #include "lost.h"
-#include "prototypes.h"
 #include "optlist.h"
 #include "server.h"
 

diff --git a/src/server/main.c b/src/server/main.c
index 5eafacc6132deee881dc90f5b64c546361734464..9166d7fa60629891cf083ac490cb29f22ebc27a1 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -37,40 +37,40 @@
 
 #include <config.h>
 
-#if !defined(_WIN32)
-#include <sys/ioctl.h>
-#endif
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
-#include <string.h>
 
 #if defined(_WIN32)
 #define WIN32
 #include <winsock2.h>
 #undef NS_ALL
 #include <process.h>
-#include "../lib/gen/getopt.h"
+#include <direct.h>
 #include "service.h"
-#include "direct.h"
+#include "../lib/gen/getopt.h"
+#else
+#include <sys/types.h>
+#include <unistd.h>
 #endif
 
-#include "misc.h"
-#include "nat.h"
+#include "empio.h"
+#include "empthread.h"
 #include "file.h"
 #include "journal.h"
-#include "player.h"
-#include "empthread.h"
-#include "plane.h"
-#include "nuke.h"
 #include "land.h"
-#include "ship.h"
-#include "sect.h"
-#include "product.h"
+#include "misc.h"
+#include "nat.h"
+#include "nuke.h"
 #include "optlist.h"
+#include "plane.h"
+#include "player.h"
+#include "product.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "server.h"
+#include "ship.h"
 #include "version.h"
-#include "prototypes.h"
 
 static void create_pidfile(char *, pid_t);
 

diff --git a/src/server/marketup.c b/src/server/marketup.c
index cdabe6d21871be70c30502fe39155f8de14277a7..4dbe7f950cfb192f6a8f6a8097f15466095e5498 100644 (file)
--- a/src/server/marketup.c
+++ b/src/server/marketup.c
@@ -33,12 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "empthread.h"
 #include "file.h"
-#include "server.h"
+#include "player.h"
 #include "prototypes.h"
+#include "server.h"
 
 /*ARGSUSED*/
 static void

diff --git a/src/server/shutdown.c b/src/server/shutdown.c
index 00f107ec9849308d0d9c8e9a5b1f7368b9722126..49bf065bc5c338b9ebde87cb99a98cb1831287eb 100644 (file)
--- a/src/server/shutdown.c
+++ b/src/server/shutdown.c
@@ -33,15 +33,12 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "empio.h"
+#include <time.h>
 #include "empthread.h"
-#include "nat.h"
 #include "file.h"
-#include <time.h>
-#include "server.h"
+#include "nat.h"
 #include "prototypes.h"
+#include "server.h"
 
 int shutdown_pending;
 

diff --git a/src/server/timestamp.c b/src/server/timestamp.c
index dc9b15ce52a21fb2b5e35375fa8944cf6d93f47c..56af06762ecdd69336be2b523f37812ab1dfa595 100644 (file)
--- a/src/server/timestamp.c
+++ b/src/server/timestamp.c
@@ -36,11 +36,10 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "misc.h"
-#include "player.h"
 #include "empthread.h"
-#include "prototypes.h"
+#include "misc.h"
 #include "optlist.h"
+#include "prototypes.h"
 #include "server.h"
 
 /*ARGSUSED*/

diff --git a/src/server/update.c b/src/server/update.c
index e6b1246783ae9298cf7c44e5c0d6f236d6e3c969..0cbbc58e2e6ee5acdb7180547fb6264418788778 100644 (file)
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -36,16 +36,15 @@
 #include <config.h>
 
 #include <errno.h>
-#include <stdlib.h>
 #ifndef _WIN32
 #include <sys/wait.h>
 #endif
 #include <time.h>
+#include "empthread.h"
 #include "misc.h"
+#include "optlist.h"
 #include "player.h"
-#include "empthread.h"
 #include "prototypes.h"
-#include "optlist.h"
 #include "server.h"
 
 empth_sem_t *update_sem;

diff --git a/src/util/fairland.c b/src/util/fairland.c
index e4e419a1240467c6251d5d6ab0d9ad0b4789cc11..3ceb0da3009ddc9522d31e8fcc01eb1aa3b57875 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -68,22 +68,23 @@ static int quiet = 0;
 
 #if defined(_WIN32)
 #include "../lib/gen/getopt.h"
+#else
+#include <unistd.h>
 #endif
 
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
+#include "file.h"
 #include "misc.h"
-#include "power.h"
 #include "nat.h"
-#include "sect.h"
-#include "file.h"
-#include "xy.h"
 #include "optlist.h"
+#include "power.h"
 #include "prototypes.h"
+#include "sect.h"
 #include "version.h"
+#include "xy.h"
 
 /* do not change these 4 defines */
 #define LANDMIN                1       /* plate altitude for normal land */

diff --git a/src/util/files.c b/src/util/files.c
index 5d1238b9aa444307dcc0d3ea9bdbf5aaf98cd62f..42752b2a99a7ea06cc3aac986787f6ca5ef5f7ef 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -35,32 +35,29 @@
 
 #include <config.h>
 
-#include <sys/types.h>
 #include <fcntl.h>
-#if !defined(_WIN32)
-#include <sys/uio.h>
-#include <sys/file.h>
-#else
+#include <errno.h>
+#if defined(_WIN32)
 #include <direct.h>
 #include "../lib/gen/getopt.h"
+#else
+#include <sys/stat.h>
+#include <unistd.h>
 #endif
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
 
+#include "file.h"
+#include "land.h"
 #include "misc.h"
-#include "sect.h"
 #include "nat.h"
-#include "ship.h"
-#include "land.h"
-#include "plane.h"
 #include "nuke.h"
+#include "optlist.h"
+#include "plane.h"
 #include "power.h"
-#include "trade.h"
-#include "file.h"
-#include "tel.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "sect.h"
+#include "ship.h"
+#include "tel.h"
+#include "trade.h"
 #include "version.h"
 
 static void file_sct_init(coord, coord, struct sctstr *ptr,

diff --git a/src/util/pconfig.c b/src/util/pconfig.c
index 593e9e9f4edf8d554001754a969843d59ff20fd2..22c506b1a8868752fe1e4a0ad5306e75fb3ac633 100644 (file)
--- a/src/util/pconfig.c
+++ b/src/util/pconfig.c
@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <stdio.h>
-#include "optlist.h"
 #include "prototypes.h"
 
 int