Clean up superfluous includes

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 587e8eec6226e41ff49c528d5a46e37a239bb79b..12bbac58f9cba2803d6cc22e5b08e124c32eacd5 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 /*
  * report rejection status of telegrams and treaties.

diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index f456bee49aab8239ff9b81563eb53ee49ba8fb56..0ec14ab2a639fa7abd1ea57ddbc34f63ebbaa3e3 100644 (file)
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.c
@@ -35,7 +35,6 @@
 
 #include "commands.h"
 #include "item.h"
-#include "lost.h"
 #include "optlist.h"
 
 /*

diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c
index 30915ccf8579631d716cdb982cb9e381e69a0d6e..bd90cd44e3f0056675a54e6a5e228171895855de 100644 (file)
--- a/src/lib/commands/assa.c
+++ b/src/lib/commands/assa.c
@@ -35,8 +35,6 @@
 
 #include "combat.h"
 #include "commands.h"
-#include "mission.h"
-#include "path.h"
 #include "empobj.h"
 #include "unit.h"
 

diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c
index 8849f6ce7d66c17e98a38be3bdcf47c1951362e4..87d19785915347e02e8421620ac5920b1a381862 100644 (file)
--- a/src/lib/commands/atta.c
+++ b/src/lib/commands/atta.c
@@ -36,8 +36,6 @@
 
 #include "combat.h"
 #include "commands.h"
-#include "land.h"
-#include "mission.h"
 #include "path.h"
 #include "ship.h"
 

diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c
index d7f689eec9d32c23a6a271fd42b29fdd3aa74115..501a4de722bc714000da715ad07a2e5b7dffc437 100644 (file)
--- a/src/lib/commands/bdes.c
+++ b/src/lib/commands/bdes.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "commands.h"
 #include "map.h"
-#include "path.h"
 
 int
 bdes(void)

diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c
index c0dfafeca1c53356d437f92569615ab797075339..1e98fba6f8f3166af8abded945995f605c81e754 100644 (file)
--- a/src/lib/commands/boar.c
+++ b/src/lib/commands/boar.c
@@ -35,8 +35,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "mission.h"
-#include "path.h"
 #include "retreat.h"
 #include "ship.h"
 

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index 15312e10f40054b5d43f229a25327a557f9316ff..63fe0c7dfa58fca4e12f5643c9b7ffb5f7b40ba4 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -39,11 +39,8 @@
 #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,

diff --git a/src/lib/commands/buy.c b/src/lib/commands/buy.c
index 297a9cc4c9e3c78b993bfda5c6b27b6fe5d48809..0302cd0db927846f010a6925d666e636a4d2f730 100644 (file)
--- a/src/lib/commands/buy.c
+++ b/src/lib/commands/buy.c
@@ -37,12 +37,8 @@
 #include "commands.h"
 #include "commodity.h"
 #include "item.h"
-#include "land.h"
-#include "loan.h"
 #include "news.h"
 #include "optlist.h"
-#include "plane.h"
-#include "ship.h"
 #include "trade.h"
 
 /*

diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index 4f537c7c38aff78a83b42e1b8c4e928837e9d264..efc647e0054467230e10bd7a4df0a20b4704bee6 100644 (file)
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.c
@@ -34,7 +34,6 @@
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int

diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index 6313ac7b9639741870f9c88f7ffb238b7e748e9e..364314c7a9a5929c53cec6c56f07360e14e9b09c 100644 (file)
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -36,7 +36,6 @@
 #include "commands.h"
 #include "item.h"
 #include "loan.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c
index 386e869b45cda0f586b43f6cb2a271d5cf180a35..d1f2a9ea8c999c47fc1935c2211fcc106e217882 100644 (file)
--- a/src/lib/commands/desi.c
+++ b/src/lib/commands/desi.c
@@ -36,7 +36,6 @@
 #include "commands.h"
 #include "map.h"
 #include "optlist.h"
-#include "path.h"
 
 int
 desi(void)

diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index b6242dcf8f82a0dbb386b3160a4f45ffe30eaf3a..1f1242c568d5c03fa5cb726b1aeb97780b20c3fc 100644 (file)
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -37,7 +37,6 @@
 #include "item.h"
 #include "path.h"
 #include "plane.h"
-#include "ship.h"
 
 int
 drop(void)

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index 39ce56718246eaf97892797c2bfba3b94126ce22..b4b0688b83715d18201f7747b3c11e5576300b47 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -41,7 +41,6 @@
 #include "commands.h"
 #include "item.h"
 #include "land.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 #include "plague.h"

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index aef826110fedd85e9a5eff82d4e5b13a62996659..075fd6fad0ebd2e7f0beb0283c6ae11988ceaca4 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -38,7 +38,6 @@
 #include "item.h"
 #include "path.h"
 #include "plane.h"
-#include "ship.h"
 
 int
 fly(void)

diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index cadac1cc919030be188c615c26781ae8a3b39306..60bbb336a89f0e9b8c871c2b7052fbe098061f07 100644 (file)
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.c
@@ -35,7 +35,6 @@
 #include "commands.h"
 #include "item.h"
 #include "plane.h"
-#include "ship.h"
 
 /*
  * harden <PLANE> <LEVEL>

diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c
index d3c99c1924e9351a62ed944c176a4fd1a146b5b8..e292342d516faab50903ddb4a60d1ae2a5b5cf4e 100644 (file)
--- a/src/lib/commands/improve.c
+++ b/src/lib/commands/improve.c
@@ -33,8 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
-#include "path.h"
 
 int
 improve(void)

diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index 9230294ca073744826d693b0b4a3206629114fdf..1bed3d943dc59b6a4a7999d1cde0f24079442119 100644 (file)
--- a/src/lib/commands/land.c
+++ b/src/lib/commands/land.c
@@ -34,7 +34,6 @@
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 
 int
 land(void)

diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c
index 826590c382bfda6e58513d85fd486b13b3a0a830..f250444a88a64e5fc05207636bcae51fe76a2dd0 100644 (file)
--- a/src/lib/commands/lboard.c
+++ b/src/lib/commands/lboard.c
@@ -35,8 +35,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "mission.h"
-#include "path.h"
 #include "ship.h"
 
 int

diff --git a/src/lib/commands/ldump.c b/src/lib/commands/ldump.c
index d63330f16285216faf70a53793c29582c74b8cac..96e5ffd43e3920b443438a56a7472dede7a5d748 100644 (file)
--- a/src/lib/commands/ldump.c
+++ b/src/lib/commands/ldump.c
@@ -35,7 +35,6 @@
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 
 int
 ldump(void)

diff --git a/src/lib/commands/leve.c b/src/lib/commands/leve.c
index 3bd962c308f5a0c93411ab8e2243e0381b5f0b50..7fd3cf496a5497eccbf9884a0f05f69a3b3fafa3 100644 (file)
--- a/src/lib/commands/leve.c
+++ b/src/lib/commands/leve.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "path.h"
 
 int
 leve(void)

diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index bb062e16bd48c134b81ac9f37ffa241fb87c0b04..68712a46a74d3344a3c964bc47faf1f27f180237 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -40,7 +40,6 @@
 #include "item.h"
 #include "land.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 cc8a46e4346a30b0323b87f34a661f89dcd98980..767a1a42783e97cdb157ea75768788fece0313d7 100644 (file)
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -36,10 +36,7 @@
 #include <config.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 a1a8980a7b76e3f6dfeb456cca094b0280bc6cf0..e71815deb26cfe9bc235ba721fe9b2d19ec25f55 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -36,10 +36,7 @@
 
 #include "commands.h"
 #include "file.h"
-#include "map.h"
-#include "path.h"
 #include "empobj.h"
-#include "unit.h"
 
 int
 march(void)

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 93f96bb6b548fb1b0380a3e1872faa6fb4c2b96c..15fdc632ba7abfcd814ebafa64d2c924868b5b51 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -36,8 +36,6 @@
 
 #include "commands.h"
 #include "mission.h"
-#include "optlist.h"
-#include "path.h"
 #include "unit.h"
 
 static int clear_mission(struct nstr_item *);

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index 8668a7350be7f0d742c66f8441db4c19da0890cb..2bcebe427cc0c0ef0b668cfb591a7f27c6cd2e5b 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -34,7 +34,6 @@
 
 #include "commands.h"
 #include "item.h"
-#include "land.h"
 #include "map.h"
 #include "optlist.h"
 #include "path.h"

diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index 6cceb65eec7d93bc8ea70cd53869e552735b9815..fa5d5f081bb83a61b4b4785a1fa593ffdbe9e16c 100644 (file)
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -33,8 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
-#include "path.h"
 #include "ship.h"
 
 /*

diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c
index 3a424fb59cd196dec07a2c8ba8ff1597697689bd..a6ea5c23c63b22cffc494765ea9ad7a2b9e6d07f 100644 (file)
--- a/src/lib/commands/para.c
+++ b/src/lib/commands/para.c
@@ -37,8 +37,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "item.h"
-#include "land.h"
-#include "mission.h"
 #include "path.h"
 #include "plane.h"
 #include "ship.h"

diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c
index 55a3fe13cdc97dfd0469dce8287ec495dc94c4f6..869949c7caae2313e8e81fb7e00838b1af18ab40 100644 (file)
--- a/src/lib/commands/pdump.c
+++ b/src/lib/commands/pdump.c
@@ -35,7 +35,6 @@
 
 #include "commands.h"
 #include "nuke.h"
-#include "optlist.h"
 #include "plane.h"
 
 int

diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index f702ed9b12e9637c0ed4bb0be1208ce69cb447b0..4cdc00c40b7e8d515f940c66a88aab20ccc1daf7 100644 (file)
--- a/src/lib/commands/plan.c
+++ b/src/lib/commands/plan.c
@@ -36,7 +36,6 @@
 
 #include "commands.h"
 #include "nuke.h"
-#include "optlist.h"
 #include "plane.h"
 
 int

diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index 809b7f8c2dedf33fd61b626efe9a3ca398560294..a0b28e999e01a79c159380e16af7d731d02b399c 100644 (file)
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 #include "unit.h"
 
 int

diff --git a/src/lib/commands/rang.c b/src/lib/commands/rang.c
index b54c6ccb445f3d154ab2c74b2ef32c05b76c910c..d806b62809c73e986ed78fe8f27d784c645741fb 100644 (file)
--- a/src/lib/commands/rang.c
+++ b/src/lib/commands/rang.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "plane.h"
 
 int

diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index 1a5f74f4bce0bb62c9f48edb5eab47068bc0ecbe..0eb83fa65cc483d44a946ad148ae29d7cb07c2c0 100644 (file)
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -36,7 +36,6 @@
 #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 eafb9c2f651a2fba10a687ff02e9a4368b5db8fa..cd53a839b5037e3a937156a254e8be7710aa97df 100644 (file)
--- a/src/lib/commands/reje.c
+++ b/src/lib/commands/reje.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 int
 reje(void)

diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c
index 43f9451a34299fc8864429f2db587208d3ce180c..6919bf3eba13281a4f811391008657cf614c43f2 100644 (file)
--- a/src/lib/commands/rese.c
+++ b/src/lib/commands/rese.c
@@ -37,10 +37,7 @@
 #include "commands.h"
 #include "commodity.h"
 #include "item.h"
-#include "land.h"
 #include "optlist.h"
-#include "plane.h"
-#include "ship.h"
 
 int
 rese(void)

diff --git a/src/lib/commands/reso.c b/src/lib/commands/reso.c
index 851bb4b4caebd1f4136760a9b7ddb1abfd46dab7..ef35eb9a338ffab272e2628f166ef351118faf23 100644 (file)
--- a/src/lib/commands/reso.c
+++ b/src/lib/commands/reso.c
@@ -33,7 +33,6 @@
 #include <config.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 1a093062cf3f00556c5c71b8681c5a5547fb33ea..758dba9b1e105d6ee6874d7c22f52f86f41b838e 100644 (file)
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -38,7 +38,6 @@
 #include "commands.h"
 #include "empobj.h"
 #include "land.h"
-#include "path.h"
 #include "retreat.h"
 #include "ship.h"
 

diff --git a/src/lib/commands/sdump.c b/src/lib/commands/sdump.c
index 3d197506426ff89078cbc45f666982121b400c17..06f86c2491e93c7d1f738d823080ff1ba009885a 100644 (file)
--- a/src/lib/commands/sdump.c
+++ b/src/lib/commands/sdump.c
@@ -34,8 +34,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int

diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c
index cf838335fec31b8ccd145f4d0fdddb7a2d9a2b74..8e5971beaff1cf6413d2674145b87c48cd43fd1e 100644 (file)
--- a/src/lib/commands/sell.c
+++ b/src/lib/commands/sell.c
@@ -38,10 +38,7 @@
 #include "commands.h"
 #include "commodity.h"
 #include "item.h"
-#include "land.h"
 #include "optlist.h"
-#include "plane.h"
-#include "ship.h"
 
 /*
  * format: sell <COMMODITY> <SECTS> <NUMBER> <PRICE>

diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 05397967186f9ad07b52728a3c1f1f54594eda48..b522f29efc8042eaebde03c71ba8fe69ecf9435c 100644 (file)
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 9d6fd6fcc96ff42fc8482cd6d9413282846d76ce..74b6169cd26e4e986f1a901f95b05b6d2b778e96 100644 (file)
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.c
@@ -33,8 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int

diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c
index a7d61d034e15051b75910577a11d89f155f807bc..51e6ab9c3558af1094f640e96835db17a7d6dd0f 100644 (file)
--- a/src/lib/commands/shoo.c
+++ b/src/lib/commands/shoo.c
@@ -36,7 +36,6 @@
 #include "item.h"
 #include "land.h"
 #include "news.h"
-#include "path.h"
 
 int
 shoo(void)

diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c
index f235079696a8e1245fbd819f898f721927acf4f6..d7a7e50cdb2ac5360ff27d85e7734b5cbd0d6c3b 100644 (file)
--- a/src/lib/commands/sstat.c
+++ b/src/lib/commands/sstat.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "ship.h"
 
 int

diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c
index 330d22f3216d3c4f12c7b9c78879b53b92836e94..32bdd314fabc3bfe0f2e3cd6e4e3d39a583c3f88 100644 (file)
--- a/src/lib/commands/stop.c
+++ b/src/lib/commands/stop.c
@@ -37,7 +37,6 @@
 #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 55e08636c1a41581a5965b0cc875236dcb426de6..c7fb579b9b0268394b9856858fe6d47bcd638abb 100644 (file)
--- a/src/lib/commands/stre.c
+++ b/src/lib/commands/stre.c
@@ -36,7 +36,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "land.h"
-#include "path.h"
 #include "ship.h"
 
 static double units_in_sector(struct combat *def);

diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c
index 7e7ce53c7b82ecdf82cfdcf5dc03d4bc06404c21..5bb4b66a4249711ab185336d3ef1da488dc7d3b5 100644 (file)
--- a/src/lib/commands/strv.c
+++ b/src/lib/commands/strv.c
@@ -37,7 +37,6 @@
 #include "item.h"
 #include "land.h"
 #include "optlist.h"
-#include "path.h"
 #include "ship.h"
 
 static void starv_sects(char *range);

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 0de9659eaa30ef9cfa783d4a016b7291ce053da3..7ec6e8e6bcf63db57294117769b1f914def86f58 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -39,7 +39,6 @@
 #include "item.h"
 #include "land.h"
 #include "plague.h"
-#include "plane.h"
 #include "ship.h"
 
 static void expose_ship(struct shpstr *s1, struct shpstr *s2);

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index df5eedec0a03188981da2342e866229a2c1dd0fd..daa4cb7493deb94e60ebeb66a4f9214af2ee203f 100644 (file)
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -38,7 +38,6 @@
 
 #include "commands.h"
 #include "news.h"
-#include "optlist.h"
 #include "retreat.h"
 #include "ship.h"
 

diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 47e1b2c6145150fac7c133d22d0cfd7e2f960c73..40e4052d9c7d114cca0f524e9b95b634f8270476 100644 (file)
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -34,11 +34,9 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
 #include "map.h"
 #include "nuke.h"
 #include "plane.h"
-#include "ship.h"
 
 static int tran_pmap(coord, coord, char *, char *);
 static int tran_nmap(coord, coord, char *, char *);

diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c
index 6e57b76b9476271bcaa357c8b21bc7e9c92faf2c..47fb4d62f9c4b224a6932beea9e784cbe4092df9 100644 (file)
--- a/src/lib/common/conftab.c
+++ b/src/lib/common/conftab.c
@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include "file.h"
 #include "optlist.h"
-#include "product.h"
 #include "prototypes.h"
 #include "xdump.h"
 

diff --git a/src/lib/common/emp_config.c b/src/lib/common/emp_config.c
index 89cead07c300b9e7fe277842fb7a75a64b804f70..216dfaca61416d9503603acb5b13235ae706c432 100644 (file)
--- a/src/lib/common/emp_config.c
+++ b/src/lib/common/emp_config.c
@@ -50,7 +50,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "file.h"
 #include "misc.h"
 #include "optlist.h"
 #include "prototypes.h"

diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index 675e776fbcdde85cf099a77fa3eb478cb4c6ea8f..7d081e2161b663a9fedd6506311195ec67cb7061 100644 (file)
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -47,7 +47,6 @@
 #include "file.h"
 #include "match.h"
 #include "misc.h"
-#include "nsc.h"
 #include "prototypes.h"
 
 static int open_locked(char *, int, mode_t);

diff --git a/src/lib/common/game.c b/src/lib/common/game.c
index 049c656772f24eac03850760c4c850f59dbf8181..125990592296bce04d6994bbd203126ce80fa074 100644 (file)
--- a/src/lib/common/game.c
+++ b/src/lib/common/game.c
@@ -46,7 +46,6 @@
 #include "file.h"
 #include "game.h"
 #include "optlist.h"
-#include "prototypes.h"
 #include "server.h"
 
 /*

diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c
index 4c5ef541514693914e99d48b1dfe897fc99296d9..7f4b0dffcd0cd543bbd4c49630fa9fe66899f968 100644 (file)
--- a/src/lib/common/hap_fact.c
+++ b/src/lib/common/hap_fact.c
@@ -34,8 +34,6 @@
 
 #include "misc.h"
 #include "nat.h"
-#include "nsc.h"
-#include "player.h"
 #include "prototypes.h"
 #include "xy.h"
 

diff --git a/src/lib/common/res_pop.c b/src/lib/common/res_pop.c
index c33751d71d221f5343d69d9032f2be7e65c3ff39..ff6d1eeab4967b4123e9f5775047ad8048f26645 100644 (file)
--- a/src/lib/common/res_pop.c
+++ b/src/lib/common/res_pop.c
@@ -35,7 +35,6 @@
 
 #include "item.h"
 #include "misc.h"
-#include "nat.h"
 #include "optlist.h"
 #include "prototypes.h"
 #include "sect.h"

diff --git a/src/lib/empthread/io.c b/src/lib/empthread/io.c
index 6578c29561002b9d17b85240fed1243eec3716b1..3c5c060273d92a912e4656792c1a85b676f0b40b 100644 (file)
--- a/src/lib/empthread/io.c
+++ b/src/lib/empthread/io.c
@@ -54,7 +54,6 @@
 #include "file.h"
 #include "ioqueue.h"
 #include "misc.h"
-#include "queue.h"
 
 struct iop {
     int fd;

diff --git a/src/lib/gen/log.c b/src/lib/gen/log.c
index dd4cef9ae300562e1e9dc0119b36e694c7b3668b..b32a996532e5819394aeb8079e8605320e2ad4d0 100644 (file)
--- a/src/lib/gen/log.c
+++ b/src/lib/gen/log.c
@@ -41,8 +41,6 @@
 #include <time.h>
 #include <unistd.h>
 #include "misc.h"
-#include "optlist.h"
-#include "player.h"
 #include "prototypes.h"
 
 void (*oops_handler)(void) = abort;

diff --git a/src/lib/lwp/arch.c b/src/lib/lwp/arch.c
index 653f33a0594e957f2d988d840a626f1800ddccb5..c3e726aecf27d9c3c675f81c911a0c6aa23739ff 100644 (file)
--- a/src/lib/lwp/arch.c
+++ b/src/lib/lwp/arch.c
@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include "lwp.h"
 #include "lwpint.h"
 
 /*

diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c
index 3de3b882d62aeaa79f204a179462fa65d5098516..aa90d144376f84023370b2838b9158cdd59eb990 100644 (file)
--- a/src/lib/lwp/queue.c
+++ b/src/lib/lwp/queue.c
@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include <stddef.h>
-#include "lwp.h"
 #include "lwpint.h"
 
 struct lwpProc *

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 92b5456e5f019f2cdf4a44d389332d789c47bd3b..9f6ecd49d8bbf50498e8cf882d51d27f39d05247 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -44,13 +44,11 @@
 
 #include "empio.h"
 #include "empthread.h"
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
 #include "power.h"
-#include "proto.h"
 #include "prototypes.h"
 
 static struct emp_qelem Players;

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index 03b87f795834d4ed0a78a784a630a1fc90124f48..73f5051c15bae6543cc7e374785bb3e1b839d27e 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -43,7 +43,6 @@
 #include "nat.h"
 #include "optlist.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 f3c5ef5c4cbd7f925946cbd24f0efde059b34566..c986847f386bf7c62a3625dea8bf060934cf0f63 100644 (file)
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "com.h"
-#include "empio.h"
 #include "file.h"
 #include "game.h"
 #include "match.h"
@@ -46,7 +45,6 @@
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "proto.h"
 #include "prototypes.h"
 
 

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index dee407cc0ed47d6844d36df57bf373815e77f41e..f5d605932d5a887e14ea85d0edb3b0d7b30d58ff 100644 (file)
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.c
@@ -41,7 +41,6 @@
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
-#include "sect.h"
 
 int
 init_nats(void)

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index b2f2c46240e1bb29133a28b140a8c0553cb1e06c..98e642edda82565d1db53d795f43f5dca03fa657 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "com.h"
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
@@ -43,9 +42,7 @@
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "proto.h"
 #include "prototypes.h"
-#include "tel.h"
 
 
 static int command(void);

diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c
index 27ff3fefa4963bf189ad8b92d5697761bb857c28..4818eb57f4d16d7db1447db8351ef05371d16a20 100644 (file)
--- a/src/lib/subs/bridgefall.c
+++ b/src/lib/subs/bridgefall.c
@@ -35,9 +35,7 @@
 
 #include "file.h"
 #include "land.h"
-#include "lost.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "optlist.h"

diff --git a/src/lib/subs/damage.c b/src/lib/subs/damage.c
index 9c2fcc2801711b7e1603ef6f1ea3e6ea65a4e39f..f5e5b2d6148485a94123e5e4d16ee6b29406da13 100644 (file)
--- a/src/lib/subs/damage.c
+++ b/src/lib/subs/damage.c
@@ -41,7 +41,6 @@
 #include "optlist.h"
 #include "plane.h"
 #include "prototypes.h"
-#include "sect.h"
 #include "ship.h"
 
 void

diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c
index bec06302381d6cd26b39b0453c94847966d662be..01dc5d4c55b6d97132557e774ccec2337e0b4520 100644 (file)
--- a/src/lib/subs/detonate.c
+++ b/src/lib/subs/detonate.c
@@ -35,7 +35,6 @@
 
 #include "file.h"
 #include "land.h"
-#include "lost.h"
 #include "map.h"
 #include "misc.h"
 #include "nat.h"

diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c
index 7426b6042de4ed66af10a2540fe835f9718a872e..afbc4b2b9b4e158b0127acc7aa9ea0ee91d1afdf 100644 (file)
--- a/src/lib/subs/getele.c
+++ b/src/lib/subs/getele.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "player.h"
 #include "prototypes.h"
 #include "tel.h"
 

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 296022a6466e59a7b7fafb8bf650db73ba7e4b6a..76e350ecc79cc9ead4e3c9e4cda75091fd688ae5 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -44,7 +44,6 @@
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
-#include "player.h"
 #include "prototypes.h"
 #include "queue.h"
 #include "xy.h"

diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index 2a3dff0fa4e0a4f91939e8e9ea09efb940ea3acf..a3557b84040e5087bf05585fbd88456727981225 100644 (file)
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -36,17 +36,13 @@
 
 #include <stdlib.h>
 #include "file.h"
-#include "land.h"
 #include "misc.h"
-#include "mission.h"
 #include "nat.h"
 #include "news.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "optlist.h"
-#include "path.h"
 #include "plane.h"
-#include "player.h"
 #include "prototypes.h"
 #include "queue.h"
 #include "sect.h"

diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 6b646f75aed8e69f9c43e02252bd28829ada308a..0480f563fcb989b7d81d4248c2e64d0b2a71ae7c 100644 (file)
--- a/src/lib/subs/nxtitem.c
+++ b/src/lib/subs/nxtitem.c
@@ -37,7 +37,6 @@
 #include "land.h"
 #include "misc.h"
 #include "nsc.h"
-#include "player.h"
 #include "prototypes.h"
 #include "ship.h"
 #include "unit.h"

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index ee2fb655ea617fb7b62d5dde07371e88f513c96f..cdc0c4828766bad864fa786108f0e4ffef7397ff 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -38,14 +38,12 @@
 #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"

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index 6413a5e6f5f8445cec547d101317d9c9b0eabff0..780283c6f5893fbf1fee4db430a5e10547a99360 100644 (file)
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -52,7 +52,6 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include "com.h"
 #include "empio.h"
 #include "file.h"
 #include "journal.h"
@@ -62,7 +61,6 @@
 #include "proto.h"
 #include "prototypes.h"
 #include "server.h"
-#include "tel.h"
 #include "xy.h"
 
 static void pr_player(struct player *pl, int id, char *buf);

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 04703560787659d9edfe7021d9480fb44dfac38c..b1d796c3a97b29a52107d66afe03f69c989170e9 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -42,7 +42,6 @@
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
-#include "player.h"
 #include "prototypes.h"
 #include "retreat.h"
 #include "sect.h"

diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c
index d2d44ada40d0905c162657c1206533a6f75d0c74..3b3e326eb7b180875ffbe7adaac23e15cb682060 100644 (file)
--- a/src/lib/subs/sarg.c
+++ b/src/lib/subs/sarg.c
@@ -38,7 +38,6 @@
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
-#include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
 #include "xy.h"

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index 769f312fe387b1d95d5229319d56ac454650b21f..9ac18dff27ef9f391cd78560d461311371ecd1ba 100644 (file)
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.c
@@ -36,13 +36,10 @@
 
 #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 "sect.h"

diff --git a/src/lib/subs/sectdamage.c b/src/lib/subs/sectdamage.c
index 0299e54b09c7435c99bc9ee5b65f60228af1eabf..587a39144a542e39d2f13490405a4fd3ccddae49 100644 (file)
--- a/src/lib/subs/sectdamage.c
+++ b/src/lib/subs/sectdamage.c
@@ -38,7 +38,6 @@
 #include "file.h"
 #include "land.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "plane.h"

diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index 66de35267ff51b14aadb9cb9844fb32d335f394e..d723c6af5f588f151b59b8fb42bd8e43bbd4a28e 100644 (file)
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -39,7 +39,6 @@
 #include "nat.h"
 #include "optlist.h"
 #include "path.h"
-#include "player.h"
 #include "prototypes.h"
 #include "sect.h"
 #include "ship.h"

diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index d42ac4012672644b1fc0e549d07fde44fbd6d1d7..f851512281edf7e069e1f9bd2f43ec6c49d65895 100644 (file)
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -43,9 +43,7 @@
 #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"

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index d972b651a162dcefae94c092c6d968430786d611..388026b20d86428a2d2f6c8ada4eb6424ae8d029 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -35,7 +35,6 @@
 #include <config.h>
 
 #include <math.h>
-#include "budg.h"
 #include "item.h"
 #include "news.h"
 #include "player.h"

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 09c975d5549c7d82396150fb23eea70a5b28c719..1bc1ff6c78dac79814aec7a0e6c50855b70200ee 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -42,7 +42,6 @@
 #include "news.h"
 #include "plague.h"
 #include "player.h"
-#include "ship.h"
 #include "update.h"
 
 static void landrepair(struct lndstr *, struct natstr *, struct bp *, int);

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index cc4d6e1550a9bef84d9d62256561f31c12e0e741..d87107a42cdc23bf50f6aa89e65834fc0f3adecd 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -40,7 +40,6 @@
 #include "empthread.h"
 #include "game.h"
 #include "journal.h"
-#include "player.h"
 #include "server.h"
 #include "unit.h"
 #include "update.h"

diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c
index 7396a36f2150891f7c4afe3d3d8e67339aa4ef8f..a692d840ecd7853d65ad35477bbe4f8e42a11d0f 100644 (file)
--- a/src/lib/update/move_sat.c
+++ b/src/lib/update/move_sat.c
@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "nsc.h"
-#include "path.h"
 #include "plane.h"
 #include "update.h"
 

diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c
index 2b3beafb214f1f2fac73cdbe1eb4d044cdf826ef..070b8c05f5415e9d49cc3dbe61910264d8b71b9e 100644 (file)
--- a/src/lib/update/nav_util.c
+++ b/src/lib/update/nav_util.c
@@ -33,11 +33,8 @@
 #include <config.h>
 
 #include "item.h"
-#include "land.h"
 #include "nsc.h"
-#include "path.h"
 #include "plague.h"
-#include "plane.h"
 #include "ship.h"
 #include "update.h"
 

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index ae14ae5d7f02a76a983d025ca8ff438d7a991b4f..4345229d002f494c4534ebf232beb4727e81547e 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -32,9 +32,7 @@
 
 #include <config.h>
 
-#include "land.h"
 #include "lost.h"
-#include "path.h"
 #include "update.h"
 
 void

diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c
index cacc4e14723ebbd1c523803aa0385f218fc67c0a..e64c67ba50641bc5af8cf7c114f2939b54532869 100644 (file)
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.c
@@ -37,7 +37,6 @@
 #include "budg.h"
 #include "item.h"
 #include "land.h"
-#include "path.h"
 #include "player.h"
 #include "ship.h"
 #include "update.h"

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index 57046a1ddb4ed48d0be0b8a3d505bd464af3c699..116d79464e23eb17b320a4f6166c60efe198328d 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -40,7 +40,6 @@
 #include "lost.h"
 #include "path.h"
 #include "player.h"
-#include "product.h"
 #include "ship.h"
 #include "update.h"
 

diff --git a/src/server/main.c b/src/server/main.c
index da02ccdf3edb609c38188b57df23ffab053a100a..44dbd626d5bdb740550cf298e81f277cdbf858ab 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -54,11 +54,8 @@
 #include "empthread.h"
 #include "file.h"
 #include "journal.h"
-#include "land.h"
 #include "match.h"
 #include "misc.h"
-#include "nat.h"
-#include "nuke.h"
 #include "optlist.h"
 #include "plane.h"
 #include "player.h"
@@ -66,7 +63,6 @@
 #include "prototypes.h"
 #include "sect.h"
 #include "server.h"
-#include "ship.h"
 #include "version.h"
 
 static void ignore(void);

diff --git a/src/server/marketup.c b/src/server/marketup.c
index ae42a096a6f7cc988dc6d45dce44339dc97a2c24..d02aac7d50e7336aae0715fafef2f2a45b366d1d 100644 (file)
--- a/src/server/marketup.c
+++ b/src/server/marketup.c
@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "empthread.h"
-#include "file.h"
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"

diff --git a/src/server/shutdown.c b/src/server/shutdown.c
index 3e4b319ba9e1b422cf8ab973b3e57c275e2521ae..389d6d8a3cc98cdef8d873ab3b1677472541f6c1 100644 (file)
--- a/src/server/shutdown.c
+++ b/src/server/shutdown.c
@@ -35,7 +35,6 @@
 
 #include <time.h>
 #include "empthread.h"
-#include "file.h"
 #include "nat.h"
 #include "prototypes.h"
 #include "server.h"

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 37bd940f29d2aec7e06aff3162b354714389ffd4..618cf7b2f20801f0a992cc8700a975cd6d46fbde 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -71,10 +71,7 @@ static int quiet = 0;
 #include <stdio.h>
 #include <unistd.h>
 #include "file.h"
-#include "misc.h"
-#include "nat.h"
 #include "optlist.h"
-#include "power.h"
 #include "prototypes.h"
 #include "sect.h"
 #include "version.h"

diff --git a/src/util/files.c b/src/util/files.c
index 986ab6f6a0ef988441f55f2955c90e328a3dc2ba..3557efc7beedf8af9ca4b265c59178db3fb41410 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -39,19 +39,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "file.h"
-#include "game.h"
-#include "land.h"
-#include "misc.h"
 #include "nat.h"
-#include "nuke.h"
 #include "optlist.h"
-#include "plane.h"
-#include "power.h"
 #include "prototypes.h"
-#include "sect.h"
-#include "ship.h"
 #include "tel.h"
-#include "trade.h"
 #include "version.h"
 
 static void