diff --git a/include/land.h b/include/land.h
index 42e4c090..a63a6cb2 100644
--- a/include/land.h
+++ b/include/land.h
@@ -41,7 +41,6 @@
 #include "queue.h"
 #include "nsc.h"
 #include "retreat.h"
-#include "var.h"
 
 #define LAND_MINEFF	10
 #define LAND_MINFIREEFF 40	/* arty must be this effic to fire */
diff --git a/include/prototypes.h b/include/prototypes.h
index 04aeecbc..4162a766 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -69,7 +69,7 @@ extern int display_mark(i_type, int);
 extern int want_to_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int nav_map(int, int, int);
-extern int count_pop(register int);
+extern int count_pop(int);
 extern int scuttle_tradeship(struct shpstr *, int);
 extern void scuttle_ship(struct shpstr *);
 extern void resnoise(struct sctstr *sptr, int public_amt, s_char *name,
@@ -95,12 +95,12 @@ extern void knockdown(struct sctstr *, struct emp_qelem *);
 /* damage.c */
 extern void landdamage(struct lndstr *, int);
 extern void ship_damage(struct shpstr *, int);
-extern int damage(register int, int);
+extern int damage(int, int);
 extern void shipdamage(struct shpstr *, int);
 extern void land_damage(struct lndstr *, int);
 extern void planedamage(struct plnstr *, int);
 extern int nukedamage(struct nchrstr *, int, int);
-extern int effdamage(register int, int);
+extern int effdamage(int, int);
 extern void item_damage(int, short *);
 extern int commdamage(int, int, i_type);
 /* check.c */
@@ -160,21 +160,21 @@ extern int max_pop(float, struct sctstr *);
 extern int sect_damage(struct sctstr *, int, struct emp_qelem *);
 extern int sectdamage(struct sctstr *, int, struct emp_qelem *);
 /* snxtit_subs.c */
-extern void snxtitem_area(register struct nstr_item *, int,
+extern void snxtitem_area(struct nstr_item *, int,
 			  struct range *);
-extern void snxtitem_dist(register struct nstr_item *, int, int, int, int);
-extern void snxtitem_xy(register struct nstr_item *, int, coord, coord);
-extern void snxtitem_all(register struct nstr_item *, int);
-extern void snxtitem_group(register struct nstr_item *, int, s_char);
+extern void snxtitem_dist(struct nstr_item *, int, int, int, int);
+extern void snxtitem_xy(struct nstr_item *, int, coord, coord);
+extern void snxtitem_all(struct nstr_item *, int);
+extern void snxtitem_group(struct nstr_item *, int, s_char);
 extern void snxtitem_rewind(struct nstr_item *);
-extern int snxtitem_list(register struct nstr_item *, int, int *, int);
+extern int snxtitem_list(struct nstr_item *, int, int *, int);
 /* snxtsect_subs.c */
-extern void snxtsct_area(register struct nstr_sect *, struct range *);
-extern void xydist_range(coord, coord, register int, struct range *);
-extern void xysize_range(register struct range *);
+extern void snxtsct_area(struct nstr_sect *, struct range *);
+extern void xydist_range(coord, coord, int, struct range *);
+extern void xysize_range(struct range *);
 extern void snxtsct_all(struct nstr_sect *);
 extern void snxtsct_rewind(struct nstr_sect *);
-extern void snxtsct_dist(register struct nstr_sect *, coord, coord, int);
+extern void snxtsct_dist(struct nstr_sect *, coord, coord, int);
 /* stmtch.c */
 /* in match.h */
 /* type.c */
@@ -376,7 +376,7 @@ extern void nuk_delete(struct nukstr *, int, int);
 /* nxtitem.c */
 extern int nxtitem(struct nstr_item *, void *);
 /* nxtsct.c */
-extern int nxtsct(register struct nstr_sect *, struct sctstr *);
+extern int nxtsct(struct nstr_sect *, struct sctstr *);
 /* plane.c */
 extern s_char *prplane(struct plnstr *);
 extern int pln_postread(int, s_char *);
@@ -507,7 +507,7 @@ extern int shp_missile_defense(coord, coord, natid, int);
 extern void shp_missdef(struct shpstr *, natid);
 extern void shp_set_tech(struct shpstr *, int);
 /* snxtitem.c */
-extern int snxtitem(register struct nstr_item *, int, s_char *);
+extern int snxtitem(struct nstr_item *, int, s_char *);
 /* snxtsct.c */
 extern int snxtsct(register struct nstr_sect *, s_char *);
 /* supply.c */
@@ -518,10 +518,10 @@ extern int try_supply_commod(int, int, int, i_type, int);
 extern int has_supply(struct lndstr *);
 extern int use_supply(struct lndstr *);
 /* takeover.c */
-extern void takeover_land(register struct lndstr *, natid, int);
-extern void takeover(register struct sctstr *, natid);
-extern void takeover_ship(register struct shpstr *, natid, int);
-extern void takeover_plane(register struct plnstr *, natid);
+extern void takeover_land(struct lndstr *, natid, int);
+extern void takeover(struct sctstr *, natid);
+extern void takeover_ship(struct shpstr *, natid, int);
+extern void takeover_plane(struct plnstr *, natid);
 /* trdsub.c */
 /* trechk.c */
 extern int trechk(register natid, register natid, int);
@@ -560,18 +560,18 @@ extern int feed_land(struct lndstr *, int, int *, int);
 /* material.c */
 /* in budg.h */
 /* mobility.c */
-extern void mob_sect(register int);
-extern void mob_ship(register int);
-extern void mob_land(register int);
-extern void mob_plane(register int);
+extern void mob_sect(int);
+extern void mob_ship(int);
+extern void mob_land(int);
+extern void mob_plane(int);
 extern void update_all_mob(void);
 extern void update_timestamps(time_t offset);
-extern void sct_do_upd_mob(register struct sctstr *sp);
-extern void shp_do_upd_mob(register struct shpstr *sp);
-extern void lnd_do_upd_mob(register struct lndstr *lp);
-extern void pln_do_upd_mob(register struct plnstr *pp);
+extern void sct_do_upd_mob(struct sctstr *sp);
+extern void shp_do_upd_mob(struct shpstr *sp);
+extern void lnd_do_upd_mob(struct lndstr *lp);
+extern void pln_do_upd_mob(struct plnstr *pp);
 /* move_sat.c */
-extern void move_sat(register struct plnstr *);
+extern void move_sat(struct plnstr *);
 /* nat.c */
 extern double logx(double, double);
 extern void prod_nat(int);
diff --git a/include/sect.h b/include/sect.h
index 795f5c2a..437bea90 100644
--- a/include/sect.h
+++ b/include/sect.h
@@ -38,7 +38,6 @@
 #define _SECT_H_
 
 #include "item.h"
-#include "var.h"
 
 /* The order of the following elements is there to match up with genitem */
 
diff --git a/include/ship.h b/include/ship.h
index 9239b5c8..a66848da 100644
--- a/include/ship.h
+++ b/include/ship.h
@@ -40,7 +40,6 @@
 #include "queue.h"
 #include "misc.h"
 #include "retreat.h"
-#include "var.h"
 
 #define	SHIP_MINEFF	20
 
diff --git a/include/xy.h b/include/xy.h
index d2a51fb9..76f5b179 100644
--- a/include/xy.h
+++ b/include/xy.h
@@ -65,8 +65,8 @@ extern coord strtox(char *str, char **end);
 extern coord strtoy(char *str, char **end);
 extern coord xabs(struct natstr *np, coord relx);
 extern coord yabs(struct natstr *np, coord rely);
-extern coord xnorm(register coord x);
-extern coord ynorm(register coord y);
+extern coord xnorm(coord x);
+extern coord ynorm(coord y);
 extern int xyinrange(coord x, coord y, struct range *rp);
 
 #endif /* _XY_H_ */
diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index cdb1759a..24f09455 100644
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "file.h"
diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index 37844c63..7f57bd79 100644
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.c
@@ -37,7 +37,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"
diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index a0878fb7..f22bda0e 100644
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "plane.h"
diff --git a/src/lib/commands/army.c b/src/lib/commands/army.c
index 993a48ee..bc087ba1 100644
--- a/src/lib/commands/army.c
+++ b/src/lib/commands/army.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "land.h"
 #include "xy.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@ int
 army(void)
 {
     struct lndstr land;
-    register int count;
+    int count;
     s_char *cp;
     s_char c;
     struct nstr_item nstr;
diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c
index bb74be16..5ab6d758 100644
--- a/src/lib/commands/assa.c
+++ b/src/lib/commands/assa.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"
diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c
index ad4e8028..56857a18 100644
--- a/src/lib/commands/atta.c
+++ b/src/lib/commands/atta.c
@@ -37,7 +37,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"
diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c
index ba423005..1c669c12 100644
--- a/src/lib/commands/bdes.c
+++ b/src/lib/commands/bdes.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "xy.h"
diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c
index 9f375f30..e2c77b1a 100644
--- a/src/lib/commands/best.c
+++ b/src/lib/commands/best.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "xy.h"
diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c
index 95f9f22a..9d5aa93f 100644
--- a/src/lib/commands/boar.c
+++ b/src/lib/commands/boar.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"
diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index f8d44741..b6c6ab4d 100644
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -361,7 +360,7 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
 static void
 eff_bomb(struct emp_qelem *list, struct sctstr *target)
 {
-    register struct plist *plp;
+    struct plist *plp;
     struct emp_qelem *qp;
     struct sctstr sect;
     int oldeff, dam = 0;
@@ -411,7 +410,7 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target)
 static void
 comm_bomb(struct emp_qelem *list, struct sctstr *target)
 {
-    register struct plist *plp;
+    struct plist *plp;
     float b;
     int i;
     int amt, before;
@@ -873,7 +872,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
 static void
 strat_bomb(struct emp_qelem *list, struct sctstr *target)
 {
-    register struct plist *plp;
+    struct plist *plp;
     int dam = 0;
     struct emp_qelem *qp;
     struct sctstr sect;
diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index aa8df368..9c446217 100644
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "sect.h"
@@ -222,7 +221,7 @@ calc_all(long p_sect[][2],
 	 int *units, int *lbuild, int *nlbuild, int *lmaint,
 	 int *planes, int *pbuild, int *npbuild, int *pmaint)
 {
-    register int y, z;
+    int y, z;
     struct natstr *np;
     int sm = 0, sb = 0, pm = 0, pb = 0, lm = 0, lb = 0;
     int *bp;
diff --git a/src/lib/commands/buy.c b/src/lib/commands/buy.c
index 59972e5e..2db7c755 100644
--- a/src/lib/commands/buy.c
+++ b/src/lib/commands/buy.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "news.h"
diff --git a/src/lib/commands/capi.c b/src/lib/commands/capi.c
index c9820eef..ed93c48d 100644
--- a/src/lib/commands/capi.c
+++ b/src/lib/commands/capi.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "xy.h"
diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index d822425a..6fe1df30 100644
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/commands/cede.c b/src/lib/commands/cede.c
index 5bfe4710..15948c59 100644
--- a/src/lib/commands/cede.c
+++ b/src/lib/commands/cede.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -51,8 +50,8 @@
 static void cede_hdr(void);
 static int cede_sect(struct nstr_sect *, natid);
 static int cede_ship(struct nstr_item *, natid);
-static void grab_sect(register struct sctstr *, natid);
-static void grab_ship(register struct shpstr *, natid);
+static void grab_sect(struct sctstr *, natid);
+static void grab_ship(struct shpstr *, natid);
 
 int
 cede(void)
@@ -195,7 +194,7 @@ cede_hdr(void)
 
 
 static void
-grab_sect(register struct sctstr *sp, natid to)
+grab_sect(struct sctstr *sp, natid to)
 {
     struct plnstr *pp;
     struct lndstr *lp;
@@ -332,10 +331,10 @@ cede_ship(struct nstr_item *ni, natid to)
 }
 
 static void
-grab_ship(register struct shpstr *sp, natid to)
+grab_ship(struct shpstr *sp, natid to)
 {
-    register struct plnstr *pp;
-    register struct lndstr *lp;
+    struct plnstr *pp;
+    struct lndstr *lp;
     struct nstr_item ni;
     struct plnstr p;
     struct lndstr l;
diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c
index f9ca649e..c5e4d240 100644
--- a/src/lib/commands/cens.c
+++ b/src/lib/commands/cens.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/coas.c b/src/lib/commands/coas.c
index 50615afc..909ee09e 100644
--- a/src/lib/commands/coas.c
+++ b/src/lib/commands/coas.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "nat.h"
@@ -144,9 +143,9 @@ coas(void)
 static int
 showship(struct coast **cpp, int x, int y)
 {
-    register struct coast *cp;
-    register struct coast *todelete = 0;
-    register struct coast **prev;
+    struct coast *cp;
+    struct coast *todelete = 0;
+    struct coast **prev;
     int nship = 0;
 
     prev = 0;
diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index 9ad041d1..754b0f7c 100644
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -35,7 +35,6 @@
 #include <math.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "file.h"
 #include "sect.h"
 #include "item.h"
@@ -49,9 +48,9 @@
 int
 coll(void)
 {
-    register int arg;
-    register int i;
-    register int val;
+    int arg;
+    int i;
+    int val;
     time_t now;
     char *p;
     struct lonstr loan;
diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index 0dff4fc3..f8105309 100644
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/conv.c b/src/lib/commands/conv.c
index 3b949f80..518ce815 100644
--- a/src/lib/commands/conv.c
+++ b/src/lib/commands/conv.c
@@ -37,7 +37,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "xy.h"
diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c
index c8630312..46990989 100644
--- a/src/lib/commands/coun.c
+++ b/src/lib/commands/coun.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "xy.h"
diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c
index 52c8c1c6..8eb1779b 100644
--- a/src/lib/commands/cuto.c
+++ b/src/lib/commands/cuto.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index 07820cf6..56ccbdb8 100644
--- a/src/lib/commands/deli.c
+++ b/src/lib/commands/deli.c
@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "file.h"
@@ -47,9 +46,9 @@ int
 deli(void)
 {
     struct sctstr sect;
-    register int dir, del;
-    register struct ichrstr *ich;
-    register int thresh;
+    int dir, del;
+    struct ichrstr *ich;
+    int thresh;
     int sx, sy;
     struct nstr_sect nstr;
     s_char buf[1024];
diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index 00d2cdd3..39aae778 100644
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.c
@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "nsc.h"
diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c
index 98194287..b53e4bee 100644
--- a/src/lib/commands/desi.c
+++ b/src/lib/commands/desi.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "xy.h"
@@ -70,7 +69,7 @@ static long
 do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash,
 	int for_real)
 {
-    register int n;
+    int n;
     s_char *p;
     int breaksanct;
     int cap_x;
diff --git a/src/lib/commands/dist.c b/src/lib/commands/dist.c
index 001670c0..5a99297b 100644
--- a/src/lib/commands/dist.c
+++ b/src/lib/commands/dist.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index b0114bb3..f045666a 100644
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"
diff --git a/src/lib/commands/dump.c b/src/lib/commands/dump.c
index 2f8c054e..f32c34e1 100644
--- a/src/lib/commands/dump.c
+++ b/src/lib/commands/dump.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/enli.c b/src/lib/commands/enli.c
index 8e2c0f98..48422157 100644
--- a/src/lib/commands/enli.c
+++ b/src/lib/commands/enli.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/flee.c b/src/lib/commands/flee.c
index 718040b2..2b739e4f 100644
--- a/src/lib/commands/flee.c
+++ b/src/lib/commands/flee.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "xy.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@ int
 flee(void)
 {
     struct shpstr ship;
-    register int count;
+    int count;
     s_char *cp;
     s_char c;
     struct nstr_item nstr;
diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index c82dd286..34bcc61d 100644
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"
diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index f9867b3d..ee15dd51 100644
--- a/src/lib/commands/foll.c
+++ b/src/lib/commands/foll.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/fort.c b/src/lib/commands/fort.c
index cbc959d2..e94678f3 100644
--- a/src/lib/commands/fort.c
+++ b/src/lib/commands/fort.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"
diff --git a/src/lib/commands/give.c b/src/lib/commands/give.c
index 7b7533b1..2b9d8948 100644
--- a/src/lib/commands/give.c
+++ b/src/lib/commands/give.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "news.h"
diff --git a/src/lib/commands/grin.c b/src/lib/commands/grin.c
index dcfca819..a69ba22c 100644
--- a/src/lib/commands/grin.c
+++ b/src/lib/commands/grin.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"
diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index 2ddad6e7..17a1fd98 100644
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "plane.h"
diff --git a/src/lib/commands/hidd.c b/src/lib/commands/hidd.c
index dd797ad7..a1c19253 100644
--- a/src/lib/commands/hidd.c
+++ b/src/lib/commands/hidd.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c
index 1762a2e3..7b77f2cd 100644
--- a/src/lib/commands/improve.c
+++ b/src/lib/commands/improve.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index 81e2b3ba..c7d2fa76 100644
--- a/src/lib/commands/land.c
+++ b/src/lib/commands/land.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"
diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index bfef6055..3f3ce5c7 100644
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "plane.h"
diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c
index 5268f57f..89778f51 100644
--- a/src/lib/commands/lboard.c
+++ b/src/lib/commands/lboard.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"
diff --git a/src/lib/commands/ldump.c b/src/lib/commands/ldump.c
index b8aeaeeb..d5a35fc1 100644
--- a/src/lib/commands/ldump.c
+++ b/src/lib/commands/ldump.c
@@ -41,7 +41,6 @@
 #include "nsc.h"
 #include "file.h"
 #include "optlist.h"
-#include "var.h"
 #include "commands.h"
 
 int
diff --git a/src/lib/commands/leve.c b/src/lib/commands/leve.c
index 70f8bb6d..676d6e98 100644
--- a/src/lib/commands/leve.c
+++ b/src/lib/commands/leve.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index 536c1d4a..d878335f 100644
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
@@ -47,12 +46,12 @@
 #include "commands.h"
 #include "optlist.h"
 
-static void look_ship(register struct shpstr *lookship);
+static void look_ship(struct shpstr *lookship);
 
 int
 look(void)
 {
-    register int i;
+    int i;
     struct nstr_item ni;
     struct shpstr myship;
     struct sctstr sect;
@@ -113,11 +112,11 @@ look(void)
 }
 
 static void
-look_ship(register struct shpstr *lookship)
+look_ship(struct shpstr *lookship)
 {
-    register struct shpstr *sp;
-    register struct mchrstr *smcp;
-    register struct mchrstr *tmcp;
+    struct shpstr *sp;
+    struct mchrstr *smcp;
+    struct mchrstr *tmcp;
     struct sctstr sect;
     int range;
     int vrange;
@@ -172,12 +171,12 @@ look_ship(register struct shpstr *lookship)
     }
 }
 
-static void look_land(register struct lndstr *lookland);
+static void look_land(struct lndstr *lookland);
 
 int
 llook(void)
 {
-    register int i;
+    int i;
     struct nstr_item ni;
     struct lndstr myland;
     struct sctstr sect;
@@ -247,10 +246,10 @@ llook(void)
 }
 
 static void
-look_land(register struct lndstr *lookland)
+look_land(struct lndstr *lookland)
 {
-    register struct plnstr *pp;
-    register struct lndstr *lp;
+    struct plnstr *pp;
+    struct lndstr *lp;
     double drange;
     int range;
     int vrange;
diff --git a/src/lib/commands/lstat.c b/src/lib/commands/lstat.c
index 62250f82..5341da95 100644
--- a/src/lib/commands/lstat.c
+++ b/src/lib/commands/lstat.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"
diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index 2dbc2c5e..8349a81f 100644
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "land.h"
 #include "sect.h"
 #include "news.h"
diff --git a/src/lib/commands/mark.c b/src/lib/commands/mark.c
index 78ea9302..9bcaf85c 100644
--- a/src/lib/commands/mark.c
+++ b/src/lib/commands/mark.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "nat.h"
-#include "var.h"
 #include "item.h"
 #include "commodity.h"
 #include "player.h"
diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index bde1f791..f9e935a8 100644
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "treaty.h"
 #include "nat.h"
diff --git a/src/lib/commands/mine.c b/src/lib/commands/mine.c
index 24c95421..cd256e41 100644
--- a/src/lib/commands/mine.c
+++ b/src/lib/commands/mine.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "land.h"
 #include "sect.h"
diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index bfe303aa..3bfc5cfb 100644
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -35,7 +35,6 @@
 #include "options.h"
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "retreat.h"
diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c
index b59be60a..e06655a6 100644
--- a/src/lib/commands/mobq.c
+++ b/src/lib/commands/mobq.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/mobu.c b/src/lib/commands/mobu.c
index 0254f583..c16d6c87 100644
--- a/src/lib/commands/mobu.c
+++ b/src/lib/commands/mobu.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/mora.c b/src/lib/commands/mora.c
index e7ce6292..dc7e0465 100644
--- a/src/lib/commands/mora.c
+++ b/src/lib/commands/mora.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "land.h"
 #include "nsc.h"
diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index 9e33ae03..526d187b 100644
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "xy.h"
diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c
index f8842b9d..73261421 100644
--- a/src/lib/commands/nati.c
+++ b/src/lib/commands/nati.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "file.h"
diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 7bfde97e..87b97663 100644
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "sect.h"
 #include "news.h"
@@ -219,7 +218,7 @@ navi(void)
 int
 nav_map(int x, int y, int show_designations)
 {
-    register s_char *ptr;
+    s_char *ptr;
     struct nstr_sect ns;
     struct natstr *np;
     struct sctstr sect;
diff --git a/src/lib/commands/ndump.c b/src/lib/commands/ndump.c
index e662003b..9b84f799 100644
--- a/src/lib/commands/ndump.c
+++ b/src/lib/commands/ndump.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "xy.h"
@@ -46,7 +45,7 @@
 int
 ndump(void)
 {
-    register int i;
+    int i;
     struct nstr_item nstr;
     struct nukstr nuk;
     time_t now;
diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index 78e9ed68..3d4b57cd 100644
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "path.h"
diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c
index a1d2ebe6..9c57bf8a 100644
--- a/src/lib/commands/newe.c
+++ b/src/lib/commands/newe.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "sect.h"
diff --git a/src/lib/commands/nuke.c b/src/lib/commands/nuke.c
index e6bc7b70..bb683d24 100644
--- a/src/lib/commands/nuke.c
+++ b/src/lib/commands/nuke.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "xy.h"
@@ -45,10 +44,10 @@
 int
 nuke(void)
 {
-    register int first_line = 0;
-    register int first_nuke;
-    register int show_comm;
-    register int i;
+    int first_line = 0;
+    int first_nuke;
+    int show_comm;
+    int i;
     struct nstr_item nstr;
     struct nukstr nuk;
     struct sctstr sect;
diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 0a1e94b6..6f3af5b0 100644
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "sect.h"
 #include "news.h"
diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c
index 03fd469b..f6183996 100644
--- a/src/lib/commands/para.c
+++ b/src/lib/commands/para.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"
diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c
index c0a5ac41..f73eacf9 100644
--- a/src/lib/commands/path.c
+++ b/src/lib/commands/path.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"
diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c
index 30d10241..213aa9cc 100644
--- a/src/lib/commands/payo.c
+++ b/src/lib/commands/payo.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c
index 183c3ebd..54ecca84 100644
--- a/src/lib/commands/pdump.c
+++ b/src/lib/commands/pdump.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "nsc.h"
diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index 1de9e3d8..b5a8ddc4 100644
--- a/src/lib/commands/plan.c
+++ b/src/lib/commands/plan.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "nsc.h"
diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index fbbab71e..9ef4c07d 100644
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "ship.h"
@@ -59,7 +58,7 @@ struct powsort {
     natid cnum;
 };
 
-static void addtopow(register short *vec, register struct powstr *pow);
+static void addtopow(short *vec, struct powstr *pow);
 static void gen_power(void);
 static void out5(double value, int round_val, int round_flag);
 static int powcmp(struct powsort *p1, struct powsort *p2);
@@ -228,8 +227,8 @@ gen_power(void)
 {
     float *f_ptr;
     float *f_pt2;
-    register struct powstr *pow;
-    register int i;
+    struct powstr *pow;
+    int i;
     struct sctstr sect;
     struct plnstr plane;
     struct shpstr ship;
diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c
index d0641bf4..b02a7657 100644
--- a/src/lib/commands/prod.c
+++ b/src/lib/commands/prod.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "sect.h"
@@ -46,10 +45,10 @@
 #include "commands.h"
 
 int
-count_pop(register int n)
+count_pop(int n)
 {
-    register int i;
-    register int pop = 0;
+    int i;
+    int pop = 0;
     struct sctstr *sp;
 
     for (i = 0; NULL != (sp = getsectid(i)); i++) {
diff --git a/src/lib/commands/pstat.c b/src/lib/commands/pstat.c
index fc36ed4f..8f320f4d 100644
--- a/src/lib/commands/pstat.c
+++ b/src/lib/commands/pstat.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "nsc.h"
diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index 00b33721..3f630ddb 100644
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "ship.h"
 #include "land.h"
 #include "sect.h"
diff --git a/src/lib/commands/rang.c b/src/lib/commands/rang.c
index 8c206f0e..8349f313 100644
--- a/src/lib/commands/rang.c
+++ b/src/lib/commands/rang.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "land.h"
diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index 408be374..9351d120 100644
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"
diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index 2ec3bb5a..68b05910 100644
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "file.h"
diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c
index 83fe1c9d..fa50fa3a 100644
--- a/src/lib/commands/repo.c
+++ b/src/lib/commands/repo.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "file.h"
diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c
index 1eceec2a..f3469cf9 100644
--- a/src/lib/commands/rese.c
+++ b/src/lib/commands/rese.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "nsc.h"
diff --git a/src/lib/commands/reso.c b/src/lib/commands/reso.c
index 02ce31a5..5af48456 100644
--- a/src/lib/commands/reso.c
+++ b/src/lib/commands/reso.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c
index b70660d5..6052038d 100644
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -35,7 +35,6 @@
 #include "options.h"
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "retreat.h"
diff --git a/src/lib/commands/rout.c b/src/lib/commands/rout.c
index 755359f1..fc8d505e 100644
--- a/src/lib/commands/rout.c
+++ b/src/lib/commands/rout.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nat.h"
 #include "nsc.h"
diff --git a/src/lib/commands/sabo.c b/src/lib/commands/sabo.c
index f1f92ad8..277eab29 100644
--- a/src/lib/commands/sabo.c
+++ b/src/lib/commands/sabo.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "land.h"
 #include "nsc.h"
 #include "file.h"
diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index 458d92d8..37e0140e 100644
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "path.h"
 #include "xy.h"
@@ -47,7 +46,7 @@
 static int
 show_sail(struct nstr_item *nstr)
 {
-    register int count = 0;
+    int count = 0;
     struct shpstr ship;
 
     while (nxtitem(nstr, (s_char *)&ship)) {
diff --git a/src/lib/commands/sate.c b/src/lib/commands/sate.c
index 8b67e258..a54b1193 100644
--- a/src/lib/commands/sate.c
+++ b/src/lib/commands/sate.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "sect.h"
diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index 2b591856..34aec37f 100644
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index 11a811e6..f8f202d4 100644
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -35,7 +35,6 @@
 #include "player.h"
 #include "sect.h"
 #include "news.h"
-#include "var.h"
 #include "xy.h"
 #include "ship.h"
 #include "land.h"
diff --git a/src/lib/commands/sdump.c b/src/lib/commands/sdump.c
index d9c35be8..b9150839 100644
--- a/src/lib/commands/sdump.c
+++ b/src/lib/commands/sdump.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/commands/sect.c b/src/lib/commands/sect.c
index 124d0558..21a962a0 100644
--- a/src/lib/commands/sect.c
+++ b/src/lib/commands/sect.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c
index fef8bcd9..e5dd1e17 100644
--- a/src/lib/commands/sell.c
+++ b/src/lib/commands/sell.c
@@ -37,7 +37,6 @@
 #include "misc.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "nsc.h"
diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index 1da178ab..d2ad2df2 100644
--- a/src/lib/commands/set.c
+++ b/src/lib/commands/set.c
@@ -34,7 +34,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 6200c08a..42c9c874 100644
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -37,7 +37,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"
diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 683adedc..fe0b0ddf 100644
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"
diff --git a/src/lib/commands/shark.c b/src/lib/commands/shark.c
index d6234b1a..cfd533ec 100644
--- a/src/lib/commands/shark.c
+++ b/src/lib/commands/shark.c
@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "file.h"
 #include "sect.h"
 #include "item.h"
@@ -49,7 +48,7 @@
 int
 shark(void)
 {
-    register int arg;
+    int arg;
     time_t now;
     char *p;
     struct lonstr loan;
diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 71c6b7df..53077eed 100644
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c
index 076cd5c4..ff9721f5 100644
--- a/src/lib/commands/shoo.c
+++ b/src/lib/commands/shoo.c
@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "news.h"
 #include "item.h"
diff --git a/src/lib/commands/sinf.c b/src/lib/commands/sinf.c
index c6b73d85..46e7ad3c 100644
--- a/src/lib/commands/sinf.c
+++ b/src/lib/commands/sinf.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 3ae45404..b8a0efde 100644
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "plane.h"
 #include "nat.h"
@@ -136,10 +135,10 @@ skyw(void)
 static int
 showsat(struct sky **skypp, int x, int y)
 {
-    register struct sky *skyp;
-    register struct sky *todelete = 0;
-    register struct sky **prev;
-    register struct plchrstr *pcp;
+    struct sky *skyp;
+    struct sky *todelete = 0;
+    struct sky **prev;
+    struct plchrstr *pcp;
     s_char *name;
     int nsat = 0;
 
diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index bf4e7c67..a050dade 100644
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index a0f29831..21d7a9f9 100644
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "nat.h"
diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c
index f043ebe4..3b6bbce0 100644
--- a/src/lib/commands/sstat.c
+++ b/src/lib/commands/sstat.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/commands/star.c b/src/lib/commands/star.c
index 62496ae3..554435de 100644
--- a/src/lib/commands/star.c
+++ b/src/lib/commands/star.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c
index b0d64061..50ba0c21 100644
--- a/src/lib/commands/stop.c
+++ b/src/lib/commands/stop.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/stre.c b/src/lib/commands/stre.c
index c9e9df14..ff4c735d 100644
--- a/src/lib/commands/stre.c
+++ b/src/lib/commands/stre.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"
diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c
index 591639fe..3397ef98 100644
--- a/src/lib/commands/strv.c
+++ b/src/lib/commands/strv.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/supp.c b/src/lib/commands/supp.c
index b7aa72b7..228df7e5 100644
--- a/src/lib/commands/supp.c
+++ b/src/lib/commands/supp.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"
diff --git a/src/lib/commands/surv.c b/src/lib/commands/surv.c
index 14806ca6..7840d79c 100644
--- a/src/lib/commands/surv.c
+++ b/src/lib/commands/surv.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index 296f831d..fc0d0d3e 100644
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"
diff --git a/src/lib/commands/terr.c b/src/lib/commands/terr.c
index 285c003b..7fd70c99 100644
--- a/src/lib/commands/terr.c
+++ b/src/lib/commands/terr.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c
index a042d58e..735ce67a 100644
--- a/src/lib/commands/thre.c
+++ b/src/lib/commands/thre.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "item.h"
diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index d134b513..cc07ffd9 100644
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "file.h"
 #include "xy.h"
diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 1bead78a..ef46398d 100644
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -35,7 +35,6 @@
 
 #include <ctype.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "news.h"
diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 7f8afb13..aac295c6 100644
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "xy.h"
diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index 40c6bd58..a95675f6 100644
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "ship.h"
 #include "land.h"
 #include "plane.h"
diff --git a/src/lib/commands/wing.c b/src/lib/commands/wing.c
index 654d577f..5270a839 100644
--- a/src/lib/commands/wing.c
+++ b/src/lib/commands/wing.c
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "plane.h"
 #include "xy.h"
 #include "nsc.h"
@@ -47,7 +46,7 @@ wing(void)
 {
 
     struct plnstr plane;
-    register int count;
+    int count;
     s_char *cp;
     s_char c;
     struct nstr_item nstr;
diff --git a/src/lib/commands/wipe.c b/src/lib/commands/wipe.c
index 4f6dacd7..53cffe95 100644
--- a/src/lib/commands/wipe.c
+++ b/src/lib/commands/wipe.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c
index 89006fcc..b402c7f9 100644
--- a/src/lib/commands/work.c
+++ b/src/lib/commands/work.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"
@@ -125,7 +124,7 @@ work(void)
 static int
 buildeff(struct sctstr *sp, int work, double *money)
 {
-    register int work_cost;
+    int work_cost;
     int n, hcms, lcms;
     int effdone = 0;
 
diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c
index 569dc873..3e0935a8 100644
--- a/src/lib/common/bestpath.c
+++ b/src/lib/common/bestpath.c
@@ -46,7 +46,6 @@
 #include "gamesdef.h"
 #include "misc.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "file.h"
 #include "nat.h"
diff --git a/src/lib/common/check.c b/src/lib/common/check.c
index e39fa796..eb312cf3 100644
--- a/src/lib/common/check.c
+++ b/src/lib/common/check.c
@@ -35,7 +35,6 @@
 #include "player.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "plane.h"
diff --git a/src/lib/common/damage.c b/src/lib/common/damage.c
index ce876d79..65a39a66 100644
--- a/src/lib/common/damage.c
+++ b/src/lib/common/damage.c
@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -171,10 +170,10 @@ nukedamage(struct nchrstr *ncp, int range, int airburst)
 }
 
 int
-damage(register int amt, int pct)
+damage(int amt, int pct)
 {
-    register int tmp;
-    register int lost;
+    int tmp;
+    int lost;
 
     if (amt <= 0)
 	return 0;
@@ -187,7 +186,7 @@ damage(register int amt, int pct)
 
 /* asymptotic damage to commodities, efficiency, and sectors */
 int
-effdamage(register int amt, int dam)
+effdamage(int amt, int dam)
 {
     return damage(amt, PERCENT_DAMAGE(dam));
 }
diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c
index 054e384c..9cd60c6f 100644
--- a/src/lib/common/hap_fact.c
+++ b/src/lib/common/hap_fact.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"
diff --git a/src/lib/common/land.c b/src/lib/common/land.c
index 5918fb27..21613e55 100644
--- a/src/lib/common/land.c
+++ b/src/lib/common/land.c
@@ -32,10 +32,8 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
-#include "var.h"
 #include "file.h"
 #include "path.h"
 #include "xy.h"
@@ -47,7 +45,7 @@
 int
 adj_units(coord x, coord y, natid own)
 {
-    register int i;
+    int i;
     struct sctstr sect;
 
     for (i = DIR_FIRST; i <= DIR_LAST; i++) {
@@ -61,7 +59,7 @@ adj_units(coord x, coord y, natid own)
 int
 has_units(coord x, coord y, natid cn, struct lndstr *lp)
 {
-    register int n;
+    int n;
     struct lndstr land;
 
     for (n = 0; ef_read(EF_LAND, n, (s_char *)&land); n++) {
diff --git a/src/lib/common/maps.c b/src/lib/common/maps.c
index 977f1eab..78c26b2f 100644
--- a/src/lib/common/maps.c
+++ b/src/lib/common/maps.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
@@ -49,7 +48,7 @@
 #include "subs.h"
 #include "optlist.h"
 
-static int bmnxtsct(register struct nstr_sect *);
+static int bmnxtsct(struct nstr_sect *);
 static s_char map_char(u_char type, natid own, int owner_or_god);
 
 int
@@ -107,7 +106,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
     border(&range, "     ", "");
     blankfill((s_char *)wmapbuf, &nsp->range, 1);
     if (bmap) {
-	register int c;
+	int c;
 	switch (bmap) {
 	case EF_BMAP:
 	    while (bmnxtsct(nsp) && !player->aborted) {
@@ -222,7 +221,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
 	}
     }
     if (map_flags & MAP_HIGH) {
-	register s_char *ptr;
+	s_char *ptr;
 	struct sctstr sect;
 
 	snxtsct_rewind(nsp);
@@ -260,7 +259,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
  * get the next sector in the range
  */
 static int
-bmnxtsct(register struct nstr_sect *np)
+bmnxtsct(struct nstr_sect *np)
 {
     while (1) {
 	np->dx++;
diff --git a/src/lib/common/move.c b/src/lib/common/move.c
index a4cb2d55..4367bfbb 100644
--- a/src/lib/common/move.c
+++ b/src/lib/common/move.c
@@ -34,7 +34,6 @@
 #include "gamesdef.h"
 #include "misc.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "file.h"
 #include "path.h"
diff --git a/src/lib/common/res_pop.c b/src/lib/common/res_pop.c
index b7567239..6b27f5e7 100644
--- a/src/lib/common/res_pop.c
+++ b/src/lib/common/res_pop.c
@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
diff --git a/src/lib/common/sectdamage.c b/src/lib/common/sectdamage.c
index 3c2a9fbc..7694a140 100644
--- a/src/lib/common/sectdamage.c
+++ b/src/lib/common/sectdamage.c
@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index fb190852..36899f90 100644
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -183,7 +183,7 @@ sctoff(coord x, coord y)
 }
 
 coord
-xnorm(register coord x)
+xnorm(coord x)
 {
     if (x < 0)
 	x = WORLD_X - (-x % WORLD_X);
@@ -191,7 +191,7 @@ xnorm(register coord x)
 }
 
 coord
-ynorm(register coord y)
+ynorm(coord y)
 {
     if (y < 0)
 	y = WORLD_Y - (-y % WORLD_Y);
diff --git a/src/lib/global/dir.c b/src/lib/global/dir.c
index 205499d9..30378c66 100644
--- a/src/lib/global/dir.c
+++ b/src/lib/global/dir.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 
 /* must agree with DIR_ defines */
diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index 1bc2e503..c345a265 100644
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -33,7 +33,6 @@
 
 #include <stddef.h>
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 #include "loan.h"
 #include "nsc.h"
diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index 62b47ff1..28b3f7fa 100644
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "ship.h"
 #include "plane.h"
 #include "product.h"
@@ -57,8 +56,8 @@ global_init(void)
 static void
 init_mchr(void)
 {
-    register struct mchrstr *mp;
-    register int n;
+    struct mchrstr *mp;
+    int n;
 
     for (mp = mchr, n = 0; n < shp_maxno; n++, mp++) {
 	if (mp->m_nxlight)
@@ -75,7 +74,7 @@ init_mchr(void)
 static void
 init_plchr(void)
 {
-    register struct plchrstr *pp;
+    struct plchrstr *pp;
     int pcount;
 
     for (pp = plchr, pcount = 0; pcount < pln_maxno; pcount++, pp++) {
@@ -87,7 +86,7 @@ init_plchr(void)
 static void
 init_pchr(void)
 {
-    register struct pchrstr *p;
+    struct pchrstr *p;
     int pcount;
 
     for (p = pchr, pcount = 0; pcount < prd_maxno; pcount++, p++) {
diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 1a9ac5db..0f580306 100644
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -34,7 +34,6 @@
 
 #include <stddef.h>
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 #include "loan.h"
 #include "nsc.h"
diff --git a/src/lib/global/product.c b/src/lib/global/product.c
index 5b48e63a..f99aebeb 100644
--- a/src/lib/global/product.c
+++ b/src/lib/global/product.c
@@ -36,7 +36,6 @@
 #include "product.h"
 #include "sect.h"
 #include "nat.h"
-#include "var.h"
 
 
 struct pchrstr pchr[] = {
diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index 8457c372..2a9a5145 100644
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.c
@@ -35,7 +35,6 @@
 #include "prototypes.h"
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "file.h"
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 106b9790..a4ba8ba4 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -38,7 +38,6 @@
 #include "misc.h"
 #include "player.h"
 #include "proto.h"
-#include "var.h"
 #include "com.h"
 #include "nat.h"
 #include "sect.h"
@@ -158,7 +157,7 @@ player_main(struct player *p)
 int
 command(void)
 {
-    register unsigned int x;
+    unsigned int x;
     s_char *redir;
     s_char scanspace[1024];
 
diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 936d7608..885ac08c 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -37,7 +37,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "news.h"
 #include "land.h"
 #include "sect.h"
@@ -61,7 +60,7 @@
 static void getilist(struct emp_qelem *list, natid own,
 		     struct emp_qelem *a, struct emp_qelem *b,
 		     struct emp_qelem *c, struct emp_qelem *d);
-static void ac_dog(register struct plist *ap, register struct plist *dp);
+static void ac_dog(struct plist *ap, struct plist *dp);
 
 #define FLAK_MAX        15
 
@@ -460,7 +459,7 @@ void
 ac_intercept(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
 	     struct emp_qelem *def_list, natid def_own, coord x, coord y)
 {
-    register struct plnstr *pp;
+    struct plnstr *pp;
     struct plist *plp;
     int icount;
     struct emp_qelem *next;
@@ -537,8 +536,8 @@ void
 ac_airtoair(struct emp_qelem *att_list, struct emp_qelem *int_list,
 	    natid def_own)
 {
-    register struct plist *attacker;
-    register struct plist *interceptor;
+    struct plist *attacker;
+    struct plist *interceptor;
     struct emp_qelem *att;
     struct emp_qelem *in;
     int nplanes;
@@ -619,7 +618,7 @@ all_missiles(struct emp_qelem *att_list)
 }
 
 static void
-ac_dog(register struct plist *ap, register struct plist *dp)
+ac_dog(struct plist *ap, struct plist *dp)
 {
     int att, def;
     double odds;
@@ -715,7 +714,7 @@ void
 ac_planedamage(struct plist *plp, natid from, int dam, natid other,
 	       int checkabort, int show, s_char *mesg)
 {
-    register struct plnstr *pp;
+    struct plnstr *pp;
     int disp;
     s_char dmess[255];
     int eff;
@@ -963,7 +962,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
 void
 ac_fireflak(struct emp_qelem *list, natid from, natid other, int guns)
 {
-    register struct plnstr *pp;
+    struct plnstr *pp;
     struct plist *plp;
     int n;
     float mult;
@@ -1037,7 +1036,7 @@ static void
 getilist(struct emp_qelem *list, natid own, struct emp_qelem *a,
 	 struct emp_qelem *b, struct emp_qelem *c, struct emp_qelem *d)
 {
-    register struct plchrstr *pcp;
+    struct plchrstr *pcp;
     struct plnstr plane;
     struct shpstr ship;
     struct lndstr land;
diff --git a/src/lib/subs/askyn.c b/src/lib/subs/askyn.c
index 0f654947..441dcbdb 100644
--- a/src/lib/subs/askyn.c
+++ b/src/lib/subs/askyn.c
@@ -40,7 +40,6 @@
 #include "nat.h"
 #include "tel.h"
 #include "file.h"
-#include "var.h"
 #include "prototypes.h"
 
 /*
diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c
index 992b5fea..7acc9c55 100644
--- a/src/lib/subs/aswplnsubs.c
+++ b/src/lib/subs/aswplnsubs.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c
index d6ed51cf..6e0aa4df 100644
--- a/src/lib/subs/bsanct.c
+++ b/src/lib/subs/bsanct.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@
 void
 bsanct(void)
 {
-    register int count;
+    int count;
     struct sctstr s;
     struct nstr_sect nstr;
 
diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c
index 7dd7fc08..897a9cc7 100644
--- a/src/lib/subs/caploss.c
+++ b/src/lib/subs/caploss.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "nat.h"
-#include "var.h"
 #include "sect.h"
 #include "file.h"
 #include "xy.h"
diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c
index 45a90975..b81db848 100644
--- a/src/lib/subs/control.c
+++ b/src/lib/subs/control.c
@@ -33,10 +33,8 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
-#include "var.h"
 #include "file.h"
 #include "path.h"
 #include "xy.h"
diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c
index f3f3a4ff..d572e220 100644
--- a/src/lib/subs/detonate.c
+++ b/src/lib/subs/detonate.c
@@ -43,7 +43,6 @@
 #include "news.h"
 #include "plane.h"
 #include "nsc.h"
-#include "var.h"
 #include "optlist.h"
 #include "prototypes.h"
 
diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c
index a50a2d90..c6532e90 100644
--- a/src/lib/subs/fortdef.c
+++ b/src/lib/subs/fortdef.c
@@ -37,7 +37,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 #include "nat.h"
 #include "sect.h"
@@ -222,7 +221,7 @@ int
 sb(natid att, natid def, struct sctstr *sp, coord tx, coord ty, int noisy,
    int defending)
 {
-    register int damage;
+    int damage;
     natid own;
     int shell;
     double range;
diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c
index d8b9409f..f59d872e 100644
--- a/src/lib/subs/land.c
+++ b/src/lib/subs/land.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "file.h"
 #include "land.h"
 #include "ship.h"
diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index be7288d2..a50f64a0 100644
--- a/src/lib/subs/list.c
+++ b/src/lib/subs/list.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "news.h"
 #include "ship.h"
 #include "land.h"
@@ -291,7 +290,7 @@ num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
 int
 islist(s_char *p)
 {
-    register int x;
+    int x;
 
     x = 0;
 
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index ad120be6..cd9036ff 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"
@@ -633,8 +632,8 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
 void
 lnd_put(struct emp_qelem *list, natid actor)
 {
-    register struct emp_qelem *qp;
-    register struct emp_qelem *newqp;
+    struct emp_qelem *qp;
+    struct emp_qelem *newqp;
     struct llist *llp;
 
     qp = list->q_back;
diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c
index 397f7c63..d67a36ad 100644
--- a/src/lib/subs/lostsub.c
+++ b/src/lib/subs/lostsub.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "file.h"
 #include "land.h"
 #include "ship.h"
diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index dd52c01e..4fe46af8 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -35,7 +35,6 @@
 #include "options.h"
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "retreat.h"
@@ -83,7 +82,7 @@ static int perform_mission(coord, coord, natid, struct emp_qelem *, int,
 int
 ground_interdict(coord x, coord y, natid victim, s_char *s)
 {
-    register int cn;
+    int cn;
     int dam = 0, newdam, rel;
     struct genlist mi[MAXNOC];
     int z;
@@ -170,7 +169,7 @@ int
 unit_interdict(coord x, coord y, natid victim, s_char *s, int hardtarget,
 	       int mission)
 {
-    register int cn;
+    int cn;
     int dam = 0, newdam;
     struct genlist mi[MAXNOC];
     int z;
@@ -263,7 +262,7 @@ def_support(coord x, coord y, natid victim, natid actee)
 static int
 dosupport(struct genlist *mi, coord x, coord y, natid victim, natid actee)
 {
-    register int cn;
+    int cn;
     int rel;
     int dam = 0;
 
@@ -1014,7 +1013,7 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
     struct sctstr sect;
     struct plchrstr *pcp;
     struct plist *plp;
-    register int y, bad, bad1;
+    int y, bad, bad1;
     unsigned int x;
 
     for (qp = list->q_forw; qp != list; qp = next) {
@@ -1258,7 +1257,7 @@ int
 mission_pln_equip(struct plist *plp, struct ichrstr *ip, int flags,
 		  s_char mission)
 {
-    register struct plchrstr *pcp;
+    struct plchrstr *pcp;
     struct plnstr *pp;
     int needed;
     struct lndstr land;
diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index 7150692a..5d834f07 100644
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "file.h"
diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index bcf20ebd..8834b661 100644
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "queue.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "optlist.h"
@@ -176,7 +175,7 @@ void
 msl_sel(struct emp_qelem *list, coord x, coord y, natid victim,
 	int wantflags, int nowantflags, int mission)
 {
-    register struct plchrstr *pcp;
+    struct plchrstr *pcp;
     struct plnstr plane;
     struct plist *irv;
     struct nstr_item ni;
@@ -220,8 +219,8 @@ int
 msl_intercept(coord x, coord y, natid bombown, int hardtarget,
 	      int sublaunch, int wantflags, int nowantflags)
 {
-    register struct plnstr *pp;
-    register struct plchrstr *pcp;
+    struct plnstr *pp;
+    struct plchrstr *pcp;
     struct sctstr sect;
     struct emp_qelem *irvlist;
     struct emp_qelem foo;
diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c
index 10194273..f42835f8 100644
--- a/src/lib/subs/nuke.c
+++ b/src/lib/subs/nuke.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nuke.h"
 #include "sect.h"
 #include "xy.h"
diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 0c30b7f4..3b8a8aca 100644
--- a/src/lib/subs/nxtitem.c
+++ b/src/lib/subs/nxtitem.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "ship.h"
diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c
index 8dcab789..521914b8 100644
--- a/src/lib/subs/nxtsct.c
+++ b/src/lib/subs/nxtsct.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -45,7 +44,7 @@
  * that matches the conditions.
  */
 int
-nxtsct(register struct nstr_sect *np, struct sctstr *sp)
+nxtsct(struct nstr_sect *np, struct sctstr *sp)
 {
     while (1) {
 	np->dx++;
diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c
index 24f1a6f7..72acd1f9 100644
--- a/src/lib/subs/plane.c
+++ b/src/lib/subs/plane.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "plane.h"
 #include "ship.h"
 #include "land.h"
diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index 08e43430..e9920825 100644
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -36,7 +36,6 @@
 #include <math.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -337,8 +336,8 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
     int range;
     struct plchrstr *pcp;
     struct plist *plp;
-    register int y;
-    register int bad, bad1;
+    int y;
+    int bad, bad1;
     unsigned int x;
 
     emp_initque(list);
@@ -561,7 +560,7 @@ pln_arm(struct emp_qelem *list, int dist, int mission, struct ichrstr *ip,
 static int
 pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
 {
-    register struct plchrstr *pcp;
+    struct plchrstr *pcp;
     struct plnstr *pp;
     int needed;
     struct lndstr land;
@@ -695,8 +694,8 @@ pln_equip(struct plist *plp, struct ichrstr *ip, int flags, s_char mission)
 void
 pln_put(struct emp_qelem *list)
 {
-    register struct emp_qelem *qp;
-    register struct emp_qelem *newqp;
+    struct emp_qelem *qp;
+    struct emp_qelem *newqp;
     struct plist *plp;
     struct plnstr *pp;
     struct shpstr ship;
diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index e0827969..978b9da0 100644
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "nat.h"
-#include "var.h"
 #include "retreat.h"
 #include "ship.h"
 #include "land.h"
@@ -133,8 +132,8 @@ retreat_ship1(struct shpstr *sp, s_char code, int orig)
 			/* Is this the originally scared ship, or a follower */
 {
     struct sctstr sect;
-    register int n;
-    register int m;
+    int n;
+    int m;
     int max;
     int dir;
     coord newx;
@@ -419,8 +418,8 @@ retreat_land1(struct lndstr *lp, s_char code, int orig)
 			/* Is this the originally scared unit, or a follower */
 {
     struct sctstr sect;
-    register int n;
-    register int m;
+    int n;
+    int m;
     int max;
     int dir;
     coord newx;
diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index ad472e92..b24f9e38 100644
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -39,7 +39,6 @@
 #include "ship.h"
 #include "land.h"
 #include "plane.h"
-#include "var.h"
 #include "nsc.h"
 #include "nat.h"
 #include "file.h"
diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 08125c63..8abd0ef2 100644
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "file.h"
 #include "nat.h"
diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 6172a418..987e4a5e 100644
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -45,7 +45,6 @@
 #include "misc.h"
 #include "player.h"
 #include "nuke.h"
-#include "var.h"
 #include "ship.h"
 #include "land.h"
 #include "item.h"
@@ -265,9 +264,9 @@ show_nuke_stats(int tlev)
 void
 show_nuke_build(int tlev)
 {
-    register struct nchrstr *np;
-    register int n;
-    register int avail;
+    struct nchrstr *np;
+    int n;
+    int avail;
 
     if (opt_DRNUKE)
 	pr("%13s lcm hcm  oil  rad avail tech res $\n", "");
@@ -299,8 +298,8 @@ show_nuke_build(int tlev)
 void
 show_nuke_capab(int tlev)
 {
-    register struct nchrstr *np;
-    register int i, j, n;
+    struct nchrstr *np;
+    int i, j, n;
     s_char *p;
 
     if (opt_DRNUKE)
@@ -343,8 +342,8 @@ show_nuke_capab(int tlev)
 void
 show_ship_build(int tlev)
 {
-    register struct mchrstr *mp;
-    register int n;
+    struct mchrstr *mp;
+    int n;
 
     pr("%25s lcm hcm avail tech $\n", "");
     make_new_list(tlev, EF_SHIP);
@@ -363,7 +362,7 @@ show_ship_build(int tlev)
 void
 show_ship_stats(int tlev)
 {
-    register struct mchrstr *mp;
+    struct mchrstr *mp;
     int scount;
     int techdiff;
 
@@ -457,7 +456,7 @@ show_ship_capab(int tlev)
 void
 show_plane_stats(int tlev)
 {
-    register struct plchrstr *pp;
+    struct plchrstr *pp;
     int pcount;
 
     pr("%25s acc load att def ran fuel stlth\n", "");
@@ -480,8 +479,8 @@ show_plane_stats(int tlev)
 void
 show_plane_capab(int tlev)
 {
-    register struct plchrstr *pp;
-    register int i;
+    struct plchrstr *pp;
+    int i;
     int pcount;
     int n;
     s_char *p;
@@ -508,8 +507,8 @@ show_plane_capab(int tlev)
 void
 show_plane_build(int tlev)
 {
-    register struct plchrstr *pp;
-    register int pcount;
+    struct plchrstr *pp;
+    int pcount;
 
     pr("%25s lcm hcm crew avail tech $\n", "");
     make_new_list(tlev, EF_PLANE);
@@ -525,8 +524,8 @@ show_plane_build(int tlev)
 void
 show_land_build(int tlev)
 {
-    register struct lchrstr *lp;
-    register int n;
+    struct lchrstr *lp;
+    int n;
 
     pr("%25s lcm hcm guns avail tech $\n", "");
     make_new_list(tlev, EF_LAND);
@@ -624,7 +623,7 @@ show_land_stats(int tlev)
 void
 show_sect_build(int foo)
 {
-    register int x, first = 1;
+    int x, first = 1;
 
     for (x = 0; x <= SCT_MAXDEF; x++) {
 	if (dchr[x].d_mnem == 0)
@@ -653,7 +652,7 @@ show_sect_build(int foo)
 void
 show_sect_stats(int foo)
 {
-    register int x, first = 1;
+    int x, first = 1;
     struct sctstr sect;
     struct natstr *natp;
 
@@ -685,7 +684,7 @@ show_sect_stats(int foo)
 void
 show_sect_capab(int foo)
 {
-    register int x, first = 1, i, j;
+    int x, first = 1, i, j;
     char *tmpstr;
 
     for (x = 0; x <= SCT_MAXDEF; x++) {
diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index f72d3339..f52a0480 100644
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "queue.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "plane.h"
@@ -191,8 +190,8 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
 void
 shp_put(struct emp_qelem *list, natid actor)
 {
-    register struct emp_qelem *qp;
-    register struct emp_qelem *newqp;
+    struct emp_qelem *qp;
+    struct emp_qelem *newqp;
     struct mlist *mlp;
 
     qp = list->q_back;
diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c
index 04b0a113..04611826 100644
--- a/src/lib/subs/snxtitem.c
+++ b/src/lib/subs/snxtitem.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -48,7 +47,7 @@
  * for arguments to compile into the nstr.
  */
 int
-snxtitem(register struct nstr_item *np, int type, s_char *str)
+snxtitem(struct nstr_item *np, int type, s_char *str)
 {
     struct range range;
     int list[NS_LSIZE];
@@ -126,7 +125,7 @@ snxtitem(register struct nstr_item *np, int type, s_char *str)
 }
 
 void
-snxtitem_area(register struct nstr_item *np, int type, struct range *range)
+snxtitem_area(struct nstr_item *np, int type, struct range *range)
 {
     memset(np, 0, sizeof(*np));
     np->cur = -1;
@@ -141,7 +140,7 @@ snxtitem_area(register struct nstr_item *np, int type, struct range *range)
 }
 
 void
-snxtitem_dist(register struct nstr_item *np, int type, int cx, int cy,
+snxtitem_dist(struct nstr_item *np, int type, int cx, int cy,
 	      int dist)
 {
     struct range range;
@@ -167,7 +166,7 @@ snxtitem_dist(register struct nstr_item *np, int type, int cx, int cy,
 }
 
 void
-snxtitem_xy(register struct nstr_item *np, int type, coord x, coord y)
+snxtitem_xy(struct nstr_item *np, int type, coord x, coord y)
 {
     memset(np, 0, sizeof(*np));
     np->cur = -1;
@@ -183,7 +182,7 @@ snxtitem_xy(register struct nstr_item *np, int type, coord x, coord y)
 }
 
 void
-snxtitem_all(register struct nstr_item *np, int type)
+snxtitem_all(struct nstr_item *np, int type)
 {
     memset(np, 0, sizeof(*np));
     np->cur = -1;
@@ -197,7 +196,7 @@ snxtitem_all(register struct nstr_item *np, int type)
 }
 
 void
-snxtitem_group(register struct nstr_item *np, int type, s_char group)
+snxtitem_group(struct nstr_item *np, int type, s_char group)
 {
     if (group == '~')
 	group = ' ';
@@ -222,7 +221,7 @@ snxtitem_rewind(struct nstr_item *np)
 }
 
 int
-snxtitem_list(register struct nstr_item *np, int type, int *list, int len)
+snxtitem_list(struct nstr_item *np, int type, int *list, int len)
 {
     int i;
 
diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index 13d13430..e5dd1f03 100644
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -49,7 +48,7 @@
  * for arguments to compile into the nstr.
  */
 int
-snxtsct(register struct nstr_sect *np, s_char *str)
+snxtsct(struct nstr_sect *np, s_char *str)
 {
     struct range range;
     coord cx, cy;
@@ -106,7 +105,7 @@ snxtsct_all(struct nstr_sect *np)
 }
 
 void
-snxtsct_area(register struct nstr_sect *np, struct range *range)
+snxtsct_area(struct nstr_sect *np, struct range *range)
 {
     memset(np, 0, sizeof(*np));
     np->range = *range;
@@ -133,7 +132,7 @@ snxtsct_rewind(struct nstr_sect *np)
 }
 
 void
-snxtsct_dist(register struct nstr_sect *np, coord cx, coord cy, int dist)
+snxtsct_dist(struct nstr_sect *np, coord cx, coord cy, int dist)
 {
     memset(np, 0, sizeof(*np));
     xydist_range(cx, cy, dist, &np->range);
@@ -156,7 +155,7 @@ snxtsct_dist(register struct nstr_sect *np, coord cx, coord cy, int dist)
 }
 
 void
-xysize_range(register struct range *rp)
+xysize_range(struct range *rp)
 {
     if (rp->lx >= rp->hx)
 	rp->width = WORLD_X + rp->hx - rp->lx;
@@ -180,7 +179,7 @@ xysize_range(register struct range *rp)
 
 /* This is called also called in snxtitem.c */
 void
-xydist_range(coord x, coord y, register int dist, struct range *rp)
+xydist_range(coord x, coord y, int dist, struct range *rp)
 {
     if (dist < WORLD_X / 4) {
 	rp->lx = xnorm((coord)(x - 2 * dist));
diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index ec6b2077..98d1d7f6 100644
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "nat.h"
-#include "var.h"
 #include "retreat.h"
 #include "ship.h"
 #include "land.h"
diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 43b8441e..991848b3 100644
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@
 #include "optlist.h"
 
 void
-takeover(register struct sctstr *sp, natid newown)
+takeover(struct sctstr *sp, natid newown)
 {
     struct plnstr *pp;
     struct lndstr *lp;
@@ -165,7 +164,7 @@ takeover(register struct sctstr *sp, natid newown)
 }
 
 void
-takeover_plane(register struct plnstr *pp, natid newown)
+takeover_plane(struct plnstr *pp, natid newown)
 {
     int n;
 
@@ -209,10 +208,10 @@ takeover_plane(register struct plnstr *pp, natid newown)
 }
 
 void
-takeover_ship(register struct shpstr *sp, natid newown, int hostile)
+takeover_ship(struct shpstr *sp, natid newown, int hostile)
 {
-    register struct plnstr *pp;
-    register struct lndstr *lp;
+    struct plnstr *pp;
+    struct lndstr *lp;
     struct nstr_item ni;
     struct plnstr p;
     struct lndstr llp;
@@ -266,10 +265,10 @@ takeover_ship(register struct shpstr *sp, natid newown, int hostile)
 }
 
 void
-takeover_land(register struct lndstr *landp, natid newown, int hostile)
+takeover_land(struct lndstr *landp, natid newown, int hostile)
 {
-    register struct plnstr *pp;
-    register struct lndstr *lp;
+    struct plnstr *pp;
+    struct lndstr *lp;
     struct nstr_item ni;
     struct plnstr p;
     struct lndstr llp;
diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index 0f27a73b..d856bbed 100644
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
@@ -243,7 +242,7 @@ long
 get_couval(int cnum)
 {
     struct sctstr *sp;
-    register int j, k, val;
+    int j, k, val;
     long secttot = 0;
 
     for (j = 0; NULL != (sp = getsectid(j)); j++) {
diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index 66f2c641..2419a805 100644
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -35,7 +35,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
@@ -77,7 +76,7 @@ static s_char *ReversePath(s_char *path);
 void
 finish_sects(int etu)
 {
-    register struct sctstr *sp;
+    struct sctstr *sp;
     struct natstr *np;
     int n;
     struct distinfo *infptr;
diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index 43a35234..2e3ba010 100644
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
@@ -49,12 +48,12 @@
 #include "gen.h"
 #include "subs.h"
 
-static int grow_people(struct sctstr *, register int,
-		       register struct natstr *, int *, int,
+static int grow_people(struct sctstr *, int,
+		       struct natstr *, int *, int,
 		       short *);
 static int growfood(struct sctstr *, short *, int, int);
 static void starvation(struct sctstr *);
-static void trunc_people(struct sctstr *, register struct natstr *,
+static void trunc_people(struct sctstr *, struct natstr *,
 			 short *);
 
 /*
@@ -241,7 +240,7 @@ feed_people(short *vec, int etu, int *needed)
  * Truncate any extra people that may be around
  */
 static void
-trunc_people(struct sctstr *sp, register struct natstr *np,
+trunc_people(struct sctstr *sp, struct natstr *np,
 	     short *vec)
 {
     int maxpop = max_pop(np->nat_level[NAT_RLEV], sp);
@@ -259,8 +258,8 @@ trunc_people(struct sctstr *sp, register struct natstr *np,
  * production?  Maybe with just high education?
  */
 static int
-grow_people(struct sctstr *sp, register int etu,
-	    register struct natstr *np, int *workp, int sctwork,
+grow_people(struct sctstr *sp, int etu,
+	    struct natstr *np, int *workp, int sctwork,
 	    short *vec)
 {
     int newciv;
diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 6c95bbcc..1f52ddba 100644
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -39,7 +39,6 @@
 #include "nat.h"
 #include "land.h"
 #include "ship.h"
-#include "var.h"
 #include "news.h"
 #include "file.h"
 #include "product.h"
@@ -59,16 +58,16 @@ int mil_dbl_pay;
 #define MIN(x,y)       ((x) > (y) ? (y) : (x))
 #endif
 
-static int landrepair(register struct lndstr *, struct natstr *,
+static int landrepair(struct lndstr *, struct natstr *,
 		      int *, int);
-static void upd_land(register struct lndstr *lp, register int etus,
+static void upd_land(struct lndstr *lp, int etus,
 		     struct natstr *np, int *bp, int build);
 
 int
 prod_land(int etus, int natnum, int *bp, int build)
 		/* build = 1, maintain = 0 */
 {
-    register struct lndstr *lp;
+    struct lndstr *lp;
     struct sctstr *sp;
     struct natstr *np;
     int n, k = 0;
@@ -111,7 +110,7 @@ prod_land(int etus, int natnum, int *bp, int build)
 }
 
 static void
-upd_land(register struct lndstr *lp, register int etus,
+upd_land(struct lndstr *lp, int etus,
 	 struct natstr *np, int *bp, int build)
 	       /* build = 1, maintain = 0 */
 {
@@ -233,10 +232,10 @@ upd_land(register struct lndstr *lp, register int etus,
 
 /*ARGSUSED*/
 static int
-landrepair(register struct lndstr *land, struct natstr *np,
+landrepair(struct lndstr *land, struct natstr *np,
 	   int *bp, int etus)
 {
-    register int delta;
+    int delta;
     struct sctstr *sp;
     struct lchrstr *lp;
     float leftp, buildp;
diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index bde65f7d..f70ff0fa 100644
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "player.h"
 #include "empthread.h"
-#include "var.h"
 #include "budg.h"
 #include "product.h"
 #include "player.h"
diff --git a/src/lib/update/material.c b/src/lib/update/material.c
index 7b5f2dea..01009964 100644
--- a/src/lib/update/material.c
+++ b/src/lib/update/material.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "file.h"
 #include "optlist.h"
diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c
index 4c168846..d3e25c8f 100644
--- a/src/lib/update/mobility.c
+++ b/src/lib/update/mobility.c
@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -54,10 +53,10 @@ int updating_mob = 1;
 static int timestamp_fixing;
 static int do_upd_checking = 0;
 
-static void do_mob_land(register struct lndstr *, register int);
-static void do_mob_plane(register struct plnstr *, register int);
-static void do_mob_sect(register struct sctstr *sp, register int etus);
-static void do_mob_ship(register struct shpstr *, register int);
+static void do_mob_land(struct lndstr *, int);
+static void do_mob_plane(struct plnstr *, int);
+static void do_mob_sect(struct sctstr *sp, int etus);
+static void do_mob_ship(struct shpstr *, int);
 
 static int
 increase_mob(time_t * counter, float mult)
@@ -155,7 +154,7 @@ update_all_mob(void)
 }
 
 void
-sct_do_upd_mob(register struct sctstr *sp)
+sct_do_upd_mob(struct sctstr *sp)
 {
     int etus;
 
@@ -174,7 +173,7 @@ sct_do_upd_mob(register struct sctstr *sp)
 }
 
 void
-shp_do_upd_mob(register struct shpstr *sp)
+shp_do_upd_mob(struct shpstr *sp)
 {
     int etus;
 
@@ -190,7 +189,7 @@ shp_do_upd_mob(register struct shpstr *sp)
 }
 
 void
-lnd_do_upd_mob(register struct lndstr *lp)
+lnd_do_upd_mob(struct lndstr *lp)
 {
     int etus;
 
@@ -207,7 +206,7 @@ lnd_do_upd_mob(register struct lndstr *lp)
 }
 
 void
-pln_do_upd_mob(register struct plnstr *pp)
+pln_do_upd_mob(struct plnstr *pp)
 {
     int etus;
 
@@ -224,10 +223,10 @@ pln_do_upd_mob(register struct plnstr *pp)
 }
 
 void
-mob_sect(register int etus)
+mob_sect(int etus)
 {
-    register struct sctstr *sp;
-    register int n;
+    struct sctstr *sp;
+    int n;
     time_t now;
 
     time(&now);
@@ -241,9 +240,9 @@ mob_sect(register int etus)
 }
 
 static void
-do_mob_sect(register struct sctstr *sp, register int etus)
+do_mob_sect(struct sctstr *sp, int etus)
 {
-    register int value;
+    int value;
 
     if (sp->sct_own == 0)
 	return;
@@ -262,10 +261,10 @@ do_mob_sect(register struct sctstr *sp, register int etus)
 }
 
 void
-mob_ship(register int etus)
+mob_ship(int etus)
 {
-    register struct shpstr *sp;
-    register int n;
+    struct shpstr *sp;
+    int n;
     time_t now;
 
     time(&now);
@@ -279,10 +278,10 @@ mob_ship(register int etus)
 }
 
 static void
-do_mob_ship(register struct shpstr *sp, register int etus)
+do_mob_ship(struct shpstr *sp, int etus)
 {
     int newfuel = 0;
-    register int value;
+    int value;
     int can_add, have_fuel_for, total_add;
     double d;
 
@@ -372,10 +371,10 @@ do_mob_ship(register struct shpstr *sp, register int etus)
 }
 
 void
-mob_land(register int etus)
+mob_land(int etus)
 {
-    register struct lndstr *lp;
-    register int n;
+    struct lndstr *lp;
+    int n;
     time_t now;
 
     time(&now);
@@ -389,10 +388,10 @@ mob_land(register int etus)
 }
 
 static void
-do_mob_land(register struct lndstr *lp, register int etus)
+do_mob_land(struct lndstr *lp, int etus)
 {
     int newfuel = 0;
-    register int value;
+    int value;
     int can_add, have_fuel_for, total_add;
     double d;
 
@@ -489,10 +488,10 @@ do_mob_land(register struct lndstr *lp, register int etus)
 }
 
 void
-mob_plane(register int etus)
+mob_plane(int etus)
 {
-    register struct plnstr *pp;
-    register int n;
+    struct plnstr *pp;
+    int n;
     time_t now;
 
     time(&now);
@@ -506,9 +505,9 @@ mob_plane(register int etus)
 }
 
 static void
-do_mob_plane(register struct plnstr *pp, register int etus)
+do_mob_plane(struct plnstr *pp, int etus)
 {
-    register int value;
+    int value;
 
     if (pp->pln_own == 0)
 	return;
diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c
index 8ec67e40..5f8541e6 100644
--- a/src/lib/update/move_sat.c
+++ b/src/lib/update/move_sat.c
@@ -33,7 +33,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "plane.h"
 #include "sect.h"
 #include "xy.h"
@@ -50,7 +49,7 @@
 #endif
 
 void
-move_sat(register struct plnstr *pp)
+move_sat(struct plnstr *pp)
 {
     coord x1, y1, x2, y2;
     coord dx, dy;
diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index e79ee8fd..40024ffd 100644
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
@@ -57,7 +56,7 @@
  * level of 0 yields (1) 0.4, (6) 2.2, (12) 3.9, (18) 5.2.
  */
 
-static void share_incr(register double *, register double *);
+static void share_incr(double *, double *);
 
 /*
  * for values below the "easy level" values, production is
@@ -233,12 +232,12 @@ prod_nat(int etu)
  * find out everyones increment
  */
 static void
-share_incr(register double *res, register double *tech)
+share_incr(double *res, double *tech)
 {
-    register struct natstr *np;
-    register struct natstr *other;
-    register natid i;
-    register natid j;
+    struct natstr *np;
+    struct natstr *other;
+    natid i;
+    natid j;
     int rnc;
     int tnc;
 
diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index c786e798..fb911af3 100644
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.c
@@ -35,7 +35,6 @@
 #include "misc.h"
 
 #include <ctype.h>
-#include "var.h"
 #include "ship.h"
 #include "sect.h"
 #include "news.h"
@@ -55,7 +54,7 @@
 static void swap(struct shpstr *);
 
 static void
-scuttle_it(register struct shpstr *sp)
+scuttle_it(struct shpstr *sp)
 {
     struct sctstr *sectp;
 
@@ -86,7 +85,7 @@ scuttle_it(register struct shpstr *sp)
 }
 
 static void
-nav_check_atdest(register struct shpstr *sp)
+nav_check_atdest(struct shpstr *sp)
 {
     if ((sp->shp_x == sp->shp_destx[0]) && (sp->shp_y == sp->shp_desty[0])) {
 	if ((sp->shp_destx[0] == sp->shp_destx[1]) &&
@@ -155,7 +154,7 @@ swap(struct shpstr *sp)
  */
 
 static int
-nav_loadship(register struct shpstr *sp, natid cnum)
+nav_loadship(struct shpstr *sp, natid cnum)
 {
     struct sctstr *sectp;
     int i, landown, shipown, didsomething[TMAX], rel;
@@ -233,7 +232,7 @@ nav_loadship(register struct shpstr *sp, natid cnum)
  * Modified to use shp_nav by Ken Stevens 1995
  */
 int
-nav_ship(register struct shpstr *sp)
+nav_ship(struct shpstr *sp)
 {
     struct sctstr *sectp;
     s_char *cp;
diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index 05db6bf4..2fdeaebe 100644
--- a/src/lib/update/nxtitemp.c
+++ b/src/lib/update/nxtitemp.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "ship.h"
diff --git a/src/lib/update/nxtsctp.c b/src/lib/update/nxtsctp.c
index c2f1bd9a..fa5a429f 100644
--- a/src/lib/update/nxtsctp.c
+++ b/src/lib/update/nxtsctp.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@
  * that matches the conditions.
  */
 struct sctstr *
-nxtsctp(register struct nstr_sect *np)
+nxtsctp(struct nstr_sect *np)
 {
     while (1) {
 	np->dx++;
diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 2aba3798..e06190ff 100644
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "plane.h"
 #include "ship.h"
@@ -59,8 +58,8 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
 
 		 /* Build = 1, maintain =0 */
 {
-    register struct plnstr *pp;
-    register struct plchrstr *plp;
+    struct plnstr *pp;
+    struct plchrstr *plp;
     struct natstr *np;
     float leftp, buildp;
     int left, build;
diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index 968d365b..338bcf2a 100644
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -32,11 +32,9 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "news.h"
-#include "var.h"
 #include "file.h"
 #include "path.h"
 #include "xy.h"
@@ -49,7 +47,7 @@
 #include "lost.h"
 
 void
-populace(struct natstr *np, register struct sctstr *sp, int etu)
+populace(struct natstr *np, struct sctstr *sp, int etu)
 {
     float hap;
     float tech;
@@ -135,8 +133,8 @@ populace(struct natstr *np, register struct sctstr *sp, int etu)
 }
 
 int
-total_work(register int sctwork, register int etu, register int civil,
-	   register int milit, register int uw)
+total_work(int sctwork, int etu, int civil,
+	   int milit, int uw)
 {
     return ((int)((((civil * sctwork) / 100.0 +
 		    (milit * 2 / 5.0) + uw)) * etu) / 100);
diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c
index a648f456..64b1819e 100644
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.c
@@ -35,7 +35,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
@@ -55,7 +54,7 @@
 void
 prepare_sects(int etu, int *bp)
 {
-    register struct sctstr *sp;
+    struct sctstr *sp;
     struct natstr *np;
     int n, civ_tax, uw_tax, mil_pay;
 
diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c
index dc36cf1c..3ef3d8b7 100644
--- a/src/lib/update/produce.c
+++ b/src/lib/update/produce.c
@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "product.h"
 #include "nat.h"
@@ -56,7 +55,7 @@ int
 produce(struct natstr *np, struct sctstr *sp, short *vec, int work,
 	int desig, int neweff, int *cost, int *amount)
 {
-    register struct pchrstr *product;
+    struct pchrstr *product;
     double p_e;
     double prodeff;
     s_char *resource;
diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 14540d9a..5b496772 100644
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -33,11 +33,9 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "news.h"
-#include "var.h"
 #include "file.h"
 #include "path.h"
 #include "xy.h"
@@ -323,7 +321,7 @@ guerrilla(struct sctstr *sp)
 	}
     }
     if (convert && sp->sct_loyal >= 50) {
-	register int n;
+	int n;
 	/* new owner gets to keep the mobility there */
 	oldmob = sp->sct_mobil;
 	/* che won, and sector converts. */
diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index b05c989b..9a8e9dad 100644
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -35,11 +35,9 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "ship.h"
-#include "var.h"
 #include "news.h"
 #include "file.h"
 #include "nat.h"
diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index ffd5f4b3..52e3d811 100644
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"
@@ -61,10 +60,10 @@
  * Return amount of work used.
  */
 static int
-upd_buildeff(struct natstr *np, register struct sctstr *sp, int *workp,
+upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
 	     short *vec, int etu, int *desig, int sctwork, int *cost)
 {
-    register int work_cost = 0;
+    int work_cost = 0;
     int buildeff_work = *workp / 2;
     int n, hcms, lcms, neweff;
     u_char old_type = *desig;
@@ -204,7 +203,7 @@ meltitems(int etus, int fallout, int own, short *vec, int type, int x, int y,
  */
 
 void
-do_fallout(register struct sctstr *sp, register int etus)
+do_fallout(struct sctstr *sp, int etus)
 {
     struct shpstr *spp;
     struct lndstr *lp;
@@ -246,7 +245,7 @@ spread_fallout(struct sctstr *sp, int etus)
 {
     struct sctstr *ap;
     int n;
-    register int inc;
+    int inc;
 
     if (etus > 24)
 	etus = 24;
@@ -297,8 +296,8 @@ void
 produce_sect(int natnum, int etu, int *bp, long int (*p_sect)[2],
 	     int sector_type)
 {
-    register struct sctstr *sp;
-    register struct natstr *np;
+    struct sctstr *sp;
+    struct natstr *np;
     short buf[I_MAX + 1];
     short *vec;
     int work, cost, ecost, pcost, sctwork;
diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index a5e6e1ad..8d98a2ce 100644
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -37,7 +37,6 @@
 #include "sect.h"
 #include "nat.h"
 #include "ship.h"
-#include "var.h"
 #include "news.h"
 #include "file.h"
 #include "product.h"
@@ -57,16 +56,16 @@
 #define MIN(x,y)        ((x) > (y) ? (y) : (x))
 #endif
 
-static int shiprepair(register struct shpstr *, struct natstr *,
+static int shiprepair(struct shpstr *, struct natstr *,
 		      int *, int);
-static void upd_ship(register struct shpstr *, register int,
+static void upd_ship(struct shpstr *, int,
 		     struct natstr *, int *, int);
 
 int
 prod_ship(int etus, int natnum, int *bp, int build)
 		/* build = 1, maintain = 0 */
 {
-    register struct shpstr *sp;
+    struct shpstr *sp;
     struct natstr *np;
     int n, k = 0;
     int start_money;
@@ -110,7 +109,7 @@ prod_ship(int etus, int natnum, int *bp, int build)
 }
 
 static void
-upd_ship(register struct shpstr *sp, register int etus,
+upd_ship(struct shpstr *sp, int etus,
 	 struct natstr *np, int *bp, int build)
 	       /* build = 1, maintain = 0 */
 {
@@ -267,10 +266,10 @@ upd_ship(register struct shpstr *sp, register int etus,
  * 8 * 8 * $40 = $2560!
  */
 static int
-shiprepair(register struct shpstr *ship, struct natstr *np,
+shiprepair(struct shpstr *ship, struct natstr *np,
 	   int *bp, int etus)
 {
-    register int delta;
+    int delta;
     struct sctstr *sp;
     struct mchrstr *mp;
     float leftp, buildp;
diff --git a/src/server/main.c b/src/server/main.c
index 4fd04da5..6ea932b3 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -60,7 +60,6 @@
 #include "land.h"
 #include "ship.h"
 #include "sect.h"
-#include "var.h"
 #include "product.h"
 #include "optlist.h"
 #include "global.h"
diff --git a/src/util/fairland.c b/src/util/fairland.c
index 0b803b51..720f6854 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -72,7 +72,6 @@ static int quiet = 0;
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include "var.h"
 #include "misc.h"
 #include "power.h"
 #include "nat.h"
@@ -1068,7 +1067,7 @@ add_resources(struct sctstr *sct)
 static void
 write_sects(void)
 {
-    register struct sctstr *sct;
+    struct sctstr *sct;
     int c, x, y, total;
 
     /*  sct = &sects[0][0]; */
diff --git a/src/util/files.c b/src/util/files.c
index 7ab83b26..397647a1 100644
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -50,7 +50,6 @@
 
 #include "options.h"
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "ship.h"