include: Drop update.h

update.h is a convenience header to include headers commonly needed in
update code.  The price for the convenience is superfluous recompiles.
Include necessary headers directly, and drop update.h

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

include/update.h

@@ -1,42 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                Ken Stevens, Steve McClure, Markus Armbruster
- *
- *  Empire 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 3 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, see <http://www.gnu.org/licenses/>.
- *
- *  ---
- *
- *  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.
- *
- *  ---
- *
- *  update.h: Include headers used for updates
- *
- *  Known contributors to this file:
- *
- */
-
-#ifndef UPDATE_H
-#define UPDATE_H
-
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
-#include "prototypes.h"
-#include "sect.h"
-
-#endif

src/lib/update/age.c

@@ -33,7 +33,10 @@
 #include <config.h>
 
 #include "chance.h"
-#include "update.h"
+#include "file.h"
+#include "nat.h"
+#include "optlist.h"
+#include "prototypes.h"
 
 int
 age_people(int n, int etu)

src/lib/update/anno.c

@@ -41,8 +41,9 @@
 #endif
 #include <stdio.h>
 #include <time.h>
+#include "optlist.h"
+#include "prototypes.h"
 #include "tel.h"
-#include "update.h"
 
 static int copy_and_expire(FILE *, FILE *, char *, time_t);
 static int copy_sink(char *, size_t, void *);

src/lib/update/bp.c

@@ -40,8 +40,10 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include "budg.h"
-#include "update.h"
+#include "optlist.h"
+#include "sect.h"
 
 /* Item types we want to track. */
 enum bp_item_idx {

src/lib/update/deliver.c

@@ -32,10 +32,13 @@
 
 #include <config.h>
 
+#include "file.h"
 #include "item.h"
+#include "optlist.h"
 #include "path.h"
 #include "plague.h"
-#include "update.h"
+#include "sect.h"
+#include "prototypes.h"
 
 #define DELIVER_BONUS 4.0
 

src/lib/update/distribute.c

@@ -35,11 +35,13 @@
 #include <config.h>
 
 #include "distribute.h"
+#include "file.h"
 #include "item.h"
+#include "optlist.h"
 #include "path.h"
 #include "plague.h"
 #include "prototypes.h"
-#include "update.h"
+#include "sect.h"
 
 #ifdef DISTRIBUTE_DEBUG
 #define DPRINTF(fmt, ...) ((void)printf(fmt , ## __VA_ARGS__))

src/lib/update/finish.c

@@ -38,8 +38,12 @@
 #include <stdlib.h>
 #include <sys/resource.h>
 #include "distribute.h"
+#include "file.h"
+#include "nat.h"
+#include "optlist.h"
 #include "path.h"
-#include "update.h"
+#include "sect.h"
+#include "prototypes.h"
 
 static void assemble_dist_paths(double *);
 

src/lib/update/human.c

@@ -37,9 +37,12 @@
 #include <math.h>
 #include "chance.h"
 #include "item.h"
+#include "optlist.h"
+#include "nat.h"
 #include "news.h"
 #include "player.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "xy.h"
 
 static int new_work(struct sctstr *, int);

src/lib/update/land.c

@@ -38,12 +38,16 @@
 #include <math.h>
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
 #include "news.h"
+#include "optlist.h"
 #include "plague.h"
 #include "player.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void landrepair(struct lndstr *, struct natstr *, struct bp *, int);
 static void upd_land(struct lndstr *, int, struct natstr *, struct bp *, int);

src/lib/update/main.c

@@ -38,11 +38,13 @@
 #include <sys/resource.h>
 #include "budg.h"
 #include "empthread.h"
+#include "file.h"
 #include "game.h"
 #include "journal.h"
+#include "optlist.h"
+#include "prototypes.h"
 #include "server.h"
 #include "unit.h"
-#include "update.h"
 
 int money[MAXNOC];
 int pops[MAXNOC];

src/lib/update/material.c

@@ -34,7 +34,8 @@
 #include <config.h>
 
 #include "chance.h"
-#include "update.h"
+#include "sect.h"
+#include "prototypes.h"
 
 /*
  * Get build materials from sector @sp.

src/lib/update/mobility.c

@@ -34,12 +34,15 @@
 
 #include <config.h>
 
+#include "file.h"
 #include "game.h"
 #include "land.h"
+#include "optlist.h"
 #include "plane.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "server.h"
 #include "ship.h"
-#include "update.h"
 
 static int do_upd_checking;
 

src/lib/update/move_sat.c

@@ -33,9 +33,13 @@
 #include <config.h>
 
 #include <math.h>
+#include "file.h"
+#include "nat.h"
 #include "nsc.h"
+#include "optlist.h"
 #include "plane.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 #ifndef PI
 #define PI	3.14159265358979323846

src/lib/update/nat.c

@@ -36,9 +36,12 @@
 
 #include <math.h>
 #include "budg.h"
+#include "file.h"
 #include "game.h"
 #include "item.h"
-#include "update.h"
+#include "optlist.h"
+#include "prototypes.h"
+#include "nat.h"
 
 /*
  * hap and edu avg mean that the weight on current happiness is

src/lib/update/nxtitemp.c

@@ -33,11 +33,12 @@
 #include <config.h>
 
 #include "empobj.h"
+#include "file.h"
 #include "land.h"
 #include "nsc.h"
+#include "prototypes.h"
 #include "ship.h"
 #include "unit.h"
-#include "update.h"
 
 void *
 nxtitemp(struct nstr_item *np)

src/lib/update/plague.c

@@ -34,11 +34,15 @@
 #include <config.h>
 
 #include "chance.h"
+#include "file.h"
 #include "item.h"
 #include "lost.h"
+#include "optlist.h"
+#include "nat.h"
 #include "news.h"
 #include "plague.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static int infect_people(struct natstr *, struct sctstr *);
 

src/lib/update/plane.c

@@ -36,11 +36,15 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "lost.h"
+#include "nat.h"
+#include "optlist.h"
 #include "plane.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 static void planerepair(struct plnstr *, struct natstr *, struct bp *, int);
 static void upd_plane(struct plnstr *, int, struct natstr *, struct bp *, int);

src/lib/update/populace.c

@@ -34,8 +34,12 @@
 #include <config.h>
 
 #include "chance.h"
+#include "file.h"
 #include "lost.h"
-#include "update.h"
+#include "optlist.h"
+#include "prototypes.h"
+#include "nat.h"
+#include "sect.h"
 
 void
 populace(struct sctstr *sp, int etu)

src/lib/update/prepare.c

@@ -37,11 +37,15 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "item.h"
 #include "land.h"
+#include "nat.h"
+#include "optlist.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 void
 prepare_sects(int etu)

src/lib/update/produce.c

@@ -34,9 +34,12 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "nat.h"
+#include "optlist.h"
 #include "player.h"
 #include "product.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void materials_charge(struct pchrstr *, short *, int);
 

src/lib/update/removewants.c

@@ -32,7 +32,9 @@
 
 #include <config.h>
 
-#include "update.h"
+#include "file.h"
+#include "nat.h"
+#include "prototypes.h"
 
 int
 update_removewants(void)

src/lib/update/revolt.c

@@ -35,14 +35,17 @@
 #include <config.h>
 
 #include "chance.h"
+#include "file.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
 #include "news.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "path.h"
 #include "plane.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void take_casualties(struct sctstr *, int);
 static void lnd_dies_fighting_che(struct lndstr *);

src/lib/update/sect.c

@@ -36,13 +36,17 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "item.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
+#include "optlist.h"
 #include "path.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 double
 buildeff(struct sctstr *sp)

src/lib/update/ship.c

@@ -38,14 +38,18 @@
 #include <math.h>
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
 #include "news.h"
+#include "optlist.h"
 #include "plague.h"
 #include "player.h"
 #include "product.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 static void shiprepair(struct shpstr *, struct natstr *, struct bp *, int);
 static void upd_ship(struct shpstr *, int, struct natstr *, struct bp *, int);