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.

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);

include/combat.h

@@ -34,8 +34,8 @@
 #ifndef COMBAT_H
 #define COMBAT_H
 
-#include "sect.h"
+#include "types.h"
-#include "queue.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;
 };
 

include/commands.h

@@ -34,27 +34,10 @@
 #ifndef COMMANDS_H
 #define COMMANDS_H
 
-#include <fcntl.h>
+#include "file.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 "nat.h"
-#include "queue.h"
+#include "player.h"
-#include "subs.h"
+#include "sect.h"
-#include "gen.h"
+#include "prototypes.h"
-#include "common.h"
-#include "lost.h"
-#include "map.h"
-#include "update.h"
-
-#include "prototypes.h"		/* must come at end, after defines and typedefs */
 
 #endif

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;

include/common.h

@@ -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

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 */

include/empthread.h

@@ -49,6 +49,8 @@
 #ifndef EMPTHREAD_H
 #define EMPTHREAD_H
 
+#include <time.h>
+
 /* thread priorities */
 enum {
     PP_MAIN	 = 7,

include/file.h

@@ -34,7 +34,6 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include <stddef.h>
 #include <time.h>
 
 struct empfile {

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;

include/land.h

@@ -36,11 +36,10 @@
 #ifndef LAND_H
 #define LAND_H
 
-#include "sect.h"
+#include "item.h"
-#include "ship.h"
 #include "queue.h"
-#include "nsc.h"
 #include "retreat.h"
+#include "types.h"
 
 #define LND_TYPE_MAX	30
 #define LAND_MINEFF	10

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)
 

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;

include/lwp.h

@@ -25,7 +25,6 @@
 #define LWP_H
 
 #include <signal.h>
-#include "misc.h"
 
 #define LWP_STACKCHECK	0x1
 #define LWP_PRINT	0x2

include/map.h

@@ -34,8 +34,7 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "misc.h"
+#include "types.h"
-#include "xy.h"
 
 #define	MAPWIDTH(persec) ((WORLD_X/2) * ((persec) + 1) + 1)
 

include/misc.h

@@ -35,9 +35,7 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include <ctype.h>
+#include <time.h>
-#include <string.h>
-#include <sys/types.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

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 */
 

include/nsc.h

@@ -36,6 +36,7 @@
 #define NSC_H
 
 #include <stddef.h>
+#include "misc.h"
 #include "xy.h"
 
 #define NS_LSIZE	128

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
 

include/path.h

@@ -34,9 +34,7 @@
 #ifndef PATH_H
 #define PATH_H
 
-#include "misc.h"
+#include "types.h"
-#include "sect.h"
-#include "xy.h"
 
 	/* direction indices */
 #define	DIR_STOP	0

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

include/player.h

@@ -35,14 +35,11 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include <sys/types.h>
+#include <time.h>
-#if !defined(_WIN32)
-#include <netinet/in.h>
-#endif
-#include "queue.h"
-#include "misc.h"
-#include "com.h"
 #include "empthread.h"
+#include "misc.h"
+#include "queue.h"
+#include "types.h"
 
 struct player {
     struct emp_qelem queue;

include/power.h

@@ -34,6 +34,8 @@
 #ifndef POWER_H
 #define POWER_H
 
+#include "types.h"
+
 struct powstr {
     natid p_nation;
     float p_sects;

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 "types.h"
-#include "player.h"
-#include "commands.h"
-#include "product.h"
-#include "empio.h"
-#include "commodity.h"
 
 /* src/server/main.c */
 extern void shutdwn(int sig);

include/sect.h

@@ -38,6 +38,7 @@
 #define SECT_H
 
 #include "item.h"
+#include "types.h"
 
 struct sctstr {
     /* initial part must match struct empobj */

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;

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

include/subs.h

@@ -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

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 */

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;

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 */

include/types.h

@@ -25,18 +25,39 @@
  *
  *  ---
  *
- *  gen.h: Includes for generic stuff
+ *  types.h: Empire types
  * 
  *  Known contributors to this file:
- * 
+ *     Markus Armbruster, 2006
  */
 
-#ifndef GEN_H
+#ifndef TYPES_H
-#define GEN_H
+#define TYPES_H
 
-#include <stdlib.h>		/* atoi etc. */
+typedef unsigned char natid;	/* NSC_NATID must match this */
-#include "misc.h"
+typedef short coord;
-#include "xy.h"			/* struct range */
+
-#include "prototypes.h"		/* must come at end, after defines and typedefs */
+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

include/update.h

@@ -34,16 +34,10 @@
 #ifndef UPDATE_H
 #define UPDATE_H
 
-#include "misc.h"
+#include "file.h"
-#include "queue.h"
-#include "sect.h"
-#include "item.h"
-#include "land.h"
-#include "plane.h"
-#include "ship.h"
 #include "nat.h"
-#include "nsc.h"
+#include "optlist.h"
-#include "product.h"
+#include "prototypes.h"
-#include "prototypes.h"		/* must come at end, after defines and typedefs */
+#include "sect.h"
 
 #endif

include/xy.h

@@ -34,8 +34,7 @@
 #ifndef XY_H
 #define XY_H
 
-#include "sect.h"
+#include "types.h"
-#include "nat.h"
 
 /* Used to calculate an offset into an array.  Used for
    dynamically sizing the world. */

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)

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>

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);

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 */

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,

src/client/main.c

@@ -36,32 +36,25 @@
 
 #include <config.h>
 
-#include "misc.h"
+#include <errno.h>
-#include "proto.h"
+#include <signal.h>
-#include "queue.h"
-#include "ioqueue.h"
-#include "tags.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
+#ifdef _WIN32
-#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
 #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

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;

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

src/client/servcmd.c

@@ -35,23 +35,22 @@
 
 #include <config.h>
 
-#include "misc.h"
+#include <ctype.h>
-#include "proto.h"
+#include <fcntl.h>
-#include "queue.h"
-#include "ioqueue.h"
-#include "tags.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#ifdef _WIN32
-#include <fcntl.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#else
 #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;

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>
-
+#ifdef _WIN32
-#if !defined(_WIN32)
-#include <unistd.h>
-#else
 #include <io.h>
+#else
+#include <unistd.h>
 #endif
-
+#include "misc.h"
+#include "ioqueue.h"
 
 int
 serverio(int s, struct ioqueue *ioq)

src/client/tags.c

@@ -34,16 +34,11 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include <string.h>
 #include "misc.h"
 #include "tags.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-
 struct tagstruct *taglist;
 
 void

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>
+#ifdef _WIN32
-#ifndef _WIN32
-#include <unistd.h>
-#else
 #include <io.h>
-#endif /* _WIN32 */
+#else
+#include <unistd.h>
+#endif
 #include "misc.h"
 #include "tags.h"
 

src/lib/as/as.h

@@ -31,7 +31,7 @@
 #define AS_H
 
 #include <stdio.h>
-#include "misc.h"
+#include "types.h"
 
 /*
  * Coordinate.

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"
 

src/lib/as/as_delete.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

src/lib/as/as_extend.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

src/lib/as/as_hash.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

src/lib/as/as_init.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

src/lib/as/as_merge.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

src/lib/as/as_search.c

@@ -24,7 +24,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

src/lib/as/as_stats.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include "as.h"
 
 /*

src/lib/as/as_winnow.c

@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "as.h"
 

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"
 

src/lib/commands/add.c

@@ -33,20 +33,12 @@
 
 #include <config.h>
 
-#include <stdio.h>
+#include <fcntl.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 "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "plague.h"
+#include "tel.h"
 
 int
 add(void)

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"
 
 /*

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)

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)

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 "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "ship.h"
 
 int
 assa(void)

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 "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "ship.h"
 
 int
 atta(void)

src/lib/commands/bdes.c

@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include "misc.h"
+#include <ctype.h>
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "map.h"
+#include "path.h"
 
 int
 bdes(void)

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)

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 "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
-#include "retreat.h"
 #include "commands.h"
+#include "land.h"
+#include "mission.h"
+#include "path.h"
+#include "retreat.h"
+#include "ship.h"
 
 int
 boar(void)

src/lib/commands/bomb.c

@@ -36,24 +36,16 @@
 #include <config.h>
 
 #include <ctype.h>
-#include <string.h>
+#include "commands.h"
-#include "misc.h"
+#include "damage.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
 #include "item.h"
+#include "land.h"
+#include "news.h"
+#include "optlist.h"
+#include "path.h"
 #include "plane.h"
 #include "retreat.h"
-#include "xy.h"
+#include "ship.h"
-#include "nsc.h"
-#include "news.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
-#include "optlist.h"
-#include "damage.h"
-#include "commands.h"
 
 static void pin_bomb(struct emp_qelem *list, struct sctstr *target);
 static void strat_bomb(struct emp_qelem *list, struct sctstr *target);

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

src/lib/commands/budg.c

@@ -36,22 +36,15 @@
 
 #include <config.h>
 
-#include <string.h>
+#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.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 "item.h"
+#include "land.h"
+#include "optlist.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,

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 "land.h"
-#include "nuke.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "treaty.h"
-#include "file.h"
-#include "path.h"
-#include "optlist.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 "ship.h"
+#include "treaty.h"
 
 static int build_nuke(struct sctstr *sp,
 		      struct nchrstr *np, short *vec, int tlev);

src/lib/commands/buy.c

@@ -35,23 +35,16 @@
 
 #include <config.h>
 
-#include "misc.h"
+#include "commands.h"
-#include "xy.h"
+#include "commodity.h"
-#include "file.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.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>

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

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)

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 "path.h"
-#include "file.h"
-#include "plane.h"
-#include "land.h"
-#include "ship.h"
-#include "nuke.h"
 #include "commands.h"
+#include "land.h"
+#include "lost.h"
+#include "nuke.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 static void cede_hdr(void);
 static int cede_sect(struct nstr_sect *, natid);

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);
 

src/lib/commands/chan.c

@@ -33,14 +33,10 @@
 
 #include <config.h>
 
-#include <ctype.h>
+#include "commands.h"
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
 #include "news.h"
 #include "optlist.h"
-#include "commands.h"
+#include <ctype.h>
 
 int
 chan(void)

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
 

src/lib/commands/coll.c

@@ -34,16 +34,11 @@
 
 #include <config.h>
 
-#include "misc.h"
+#include "commands.h"
-#include "player.h"
-#include "file.h"
-#include "sect.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

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);
 

src/lib/commands/cons.c

@@ -33,17 +33,11 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.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 "loan.h"
+#include "news.h"
 #include "optlist.h"
+#include "treaty.h"
 
 /*
  * Things common to a loan or treaty.

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);
 

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"
 

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)

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"
 

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 "item.h"
-#include "file.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "item.h"
+#include "path.h"
 
 int
 deli(void)

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"
 
 /*

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);

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"
 

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>

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 "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "item.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 drop(void)

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)

src/lib/commands/echo.c

@@ -33,8 +33,6 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "commands.h"
 
 int

src/lib/commands/edit.c

@@ -39,23 +39,15 @@
 
 #include <ctype.h>
 #include <limits.h>
-#include <stdio.h>
+#include "commands.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 "item.h"
-#include "file.h"
+#include "land.h"
+#include "lost.h"
+#include "news.h"
+#include "optlist.h"
+#include "plague.h"
 #include "plane.h"
 #include "ship.h"
-#include "land.h"
-#include "optlist.h"
-#include "commands.h"
 
 #define END -1
 

src/lib/commands/enab.c

@@ -33,9 +33,9 @@
 
 #include <config.h>
 
-#include <stdio.h>
+#if !defined(_WIN32)
-#include <fcntl.h>
+#include <unistd.h>
-#include "misc.h"
+#endif
 #include "commands.h"
 #include "optlist.h"
 

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)

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 "item.h"
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
 #include "commands.h"
+#include "item.h"
+#include "map.h"
+#include "optlist.h"
+#include "plague.h"
 
 static int explore_map(coord curx, coord cury, char *arg);
 

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"
 
 /*

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

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)

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 "item.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "path.h"
 #include "commands.h"
+#include "item.h"
+#include "path.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 fly(void)

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)