From a988b907fc8f310c3abc66f2aada083ceb949616 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 29 Apr 2006 06:41:45 +0000
Subject: [PATCH] s_char purge directed by compiler warnings.

---
 include/combat.h            |  2 +-
 include/empio.h             | 10 ++---
 include/ioqueue.h           |  8 ++--
 include/land.h              | 10 ++---
 include/map.h               |  4 +-
 include/plane.h             |  4 +-
 include/prototypes.h        | 74 ++++++++++++++++++-------------------
 include/tel.h               |  2 +-
 include/trade.h             |  2 +-
 src/lib/commands/arm.c      |  6 +--
 src/lib/commands/army.c     |  6 +--
 src/lib/commands/assa.c     |  4 +-
 src/lib/commands/atta.c     |  4 +-
 src/lib/commands/bdes.c     |  6 +--
 src/lib/commands/best.c     |  4 +-
 src/lib/commands/boar.c     |  4 +-
 src/lib/commands/bomb.c     | 32 ++++++++--------
 src/lib/commands/buil.c     | 14 +++----
 src/lib/commands/buy.c      |  2 +-
 src/lib/commands/cede.c     |  4 +-
 src/lib/commands/chan.c     |  6 +--
 src/lib/commands/comm.c     |  2 +-
 src/lib/commands/cons.c     | 10 ++---
 src/lib/commands/cuto.c     |  2 +-
 src/lib/commands/decl.c     |  4 +-
 src/lib/commands/deli.c     |  6 +--
 src/lib/commands/demo.c     |  8 ++--
 src/lib/commands/desi.c     | 10 ++---
 src/lib/commands/dist.c     |  4 +-
 src/lib/commands/drop.c     |  4 +-
 src/lib/commands/dump.c     |  2 +-
 src/lib/commands/enli.c     |  6 +--
 src/lib/commands/flee.c     |  6 +--
 src/lib/commands/fly.c      |  4 +-
 src/lib/commands/foll.c     |  4 +-
 src/lib/commands/fort.c     |  4 +-
 src/lib/commands/fuel.c     |  6 +--
 src/lib/commands/give.c     |  4 +-
 src/lib/commands/grin.c     |  4 +-
 src/lib/commands/hard.c     |  4 +-
 src/lib/commands/improve.c  |  6 +--
 src/lib/commands/info.c     | 46 +++++++++++------------
 src/lib/commands/laun.c     | 12 +++---
 src/lib/commands/lboard.c   |  4 +-
 src/lib/commands/load.c     | 44 +++++++++++-----------
 src/lib/commands/lten.c     |  4 +-
 src/lib/commands/map.c      |  2 +-
 src/lib/commands/marc.c     |  6 +--
 src/lib/commands/mfir.c     |  8 ++--
 src/lib/commands/mine.c     |  2 +-
 src/lib/commands/mobq.c     |  4 +-
 src/lib/commands/mora.c     |  6 +--
 src/lib/commands/name.c     |  4 +-
 src/lib/commands/navi.c     | 10 ++---
 src/lib/commands/news.c     | 12 +++---
 src/lib/commands/offe.c     | 12 +++---
 src/lib/commands/orde.c     | 14 +++----
 src/lib/commands/orig.c     |  4 +-
 src/lib/commands/para.c     |  4 +-
 src/lib/commands/path.c     |  8 ++--
 src/lib/commands/powe.c     |  2 +-
 src/lib/commands/rada.c     |  4 +-
 src/lib/commands/rang.c     |  4 +-
 src/lib/commands/rea.c      | 10 ++---
 src/lib/commands/reco.c     |  4 +-
 src/lib/commands/reje.c     |  4 +-
 src/lib/commands/rese.c     |  2 +-
 src/lib/commands/retr.c     | 12 +++---
 src/lib/commands/rout.c     |  8 ++--
 src/lib/commands/scra.c     |  8 ++--
 src/lib/commands/scut.c     | 10 ++---
 src/lib/commands/sect.c     |  6 +--
 src/lib/commands/sell.c     |  2 +-
 src/lib/commands/set.c      |  2 +-
 src/lib/commands/setres.c   |  6 +--
 src/lib/commands/setsect.c  | 12 +++---
 src/lib/commands/show.c     |  4 +-
 src/lib/commands/skyw.c     |  2 +-
 src/lib/commands/strv.c     | 14 +++----
 src/lib/commands/surv.c     |  8 ++--
 src/lib/commands/swap.c     |  4 +-
 src/lib/commands/tend.c     | 12 +++---
 src/lib/commands/terr.c     |  6 +--
 src/lib/commands/thre.c     |  6 +--
 src/lib/commands/togg.c     |  2 +-
 src/lib/commands/torp.c     | 10 ++---
 src/lib/commands/trad.c     |  2 +-
 src/lib/commands/upgr.c     |  4 +-
 src/lib/commands/wing.c     |  6 +--
 src/lib/commands/work.c     |  4 +-
 src/lib/commands/zdon.c     |  4 +-
 src/lib/common/mailbox.c    |  4 +-
 src/lib/common/maps.c       | 26 ++++++-------
 src/lib/common/path.c       | 26 ++++++-------
 src/lib/gen/copy.c          |  8 ++--
 src/lib/gen/emp_config.c    |  6 +--
 src/lib/gen/io.c            | 12 +++---
 src/lib/gen/ioqueue.c       | 22 +++++------
 src/lib/gen/numstr.c        | 12 +++---
 src/lib/gen/onearg.c        |  4 +-
 src/lib/gen/plur.c          |  6 +--
 src/lib/player/empdis.c     |  4 +-
 src/lib/player/nat.c        |  4 +-
 src/lib/subs/aircombat.c    | 14 +++----
 src/lib/subs/askyn.c        |  8 ++--
 src/lib/subs/attsub.c       | 46 +++++++++++------------
 src/lib/subs/border.c       |  2 +-
 src/lib/subs/caploss.c      |  2 +-
 src/lib/subs/chkmoney.c     | 12 +++---
 src/lib/subs/detonate.c     |  6 +--
 src/lib/subs/land.c         |  2 +-
 src/lib/subs/list.c         |  2 +-
 src/lib/subs/lndsub.c       | 22 +++++------
 src/lib/subs/mission.c      | 16 ++++----
 src/lib/subs/mslsub.c       | 14 +++----
 src/lib/subs/mtch.c         |  2 +-
 src/lib/subs/plane.c        |  2 +-
 src/lib/subs/radmap.c       |  4 +-
 src/lib/subs/rej.c          |  8 ++--
 src/lib/subs/satmap.c       |  6 +--
 src/lib/subs/sect.c         |  4 +-
 src/lib/subs/ship.c         |  2 +-
 src/lib/subs/shpsub.c       | 16 ++++----
 src/lib/subs/supply.c       |  2 +-
 src/lib/subs/trdsub.c       |  2 +-
 src/lib/subs/trechk.c       |  2 +-
 src/lib/update/distribute.c |  2 +-
 src/lib/update/finish.c     | 18 ++++-----
 src/lib/update/sail.c       |  4 +-
 src/server/shutdown.c       |  2 +-
 130 files changed, 527 insertions(+), 527 deletions(-)

diff --git a/include/combat.h b/include/combat.h
index 4b9c0c42..8f764594 100644
--- a/include/combat.h
+++ b/include/combat.h
@@ -56,7 +56,7 @@ struct combat {
     struct dchrstr *sct_dcp;
     struct mchrstr *shp_mcp;
     struct lchrstr *lnd_lcp;
-    s_char shp_name[MAXSHPNAMLEN];
+    char shp_name[MAXSHPNAMLEN];
     int relations_checked;
 };
 
diff --git a/include/empio.h b/include/empio.h
index 3f22b9cb..d57278b6 100644
--- a/include/empio.h
+++ b/include/empio.h
@@ -54,12 +54,12 @@ extern int io_input(struct iop *, int);
 extern int io_inputwaiting(struct iop *);
 extern int io_outputwaiting(struct iop *);
 extern int io_output(struct iop *, int);
-extern int io_peek(struct iop *, s_char *, int);
-extern int io_read(struct iop *, s_char *, int);
-extern int io_write(struct iop *, s_char *, int, int);
+extern int io_peek(struct iop *, char *, int);
+extern int io_read(struct iop *, char *, int);
+extern int io_write(struct iop *, char *, int, int);
 extern int io_output_all(struct iop *);
-extern int io_gets(struct iop *, s_char *, int);
-extern int io_puts(struct iop *, s_char *);
+extern int io_gets(struct iop *, char *, int);
+extern int io_puts(struct iop *, char *);
 extern int io_shutdown(struct iop *, int);
 extern int io_error(struct iop *);
 extern int io_eof(struct iop *);
diff --git a/include/ioqueue.h b/include/ioqueue.h
index 9c5ae76f..d8b78bbf 100644
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -56,11 +56,11 @@ extern int ioq_makebuf(struct ioqueue *ioq, char *pBuf, int nBufLen);
 #else
 extern int ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc);
 #endif
-extern int ioq_peek(struct ioqueue *ioq, s_char *buf, int cc);
+extern int ioq_peek(struct ioqueue *ioq, char *buf, int cc);
 extern int ioq_dequeue(struct ioqueue *ioq, int cc);
-extern void ioq_append(struct ioqueue *ioq, s_char *buf, int cc);
+extern void ioq_append(struct ioqueue *ioq, char *buf, int cc);
 extern int ioq_qsize(struct ioqueue *ioq);
-extern int ioq_gets(struct ioqueue *ioq, s_char *buf, int cc);
-extern int ioq_puts(struct ioqueue *ioq, s_char *buf);
+extern int ioq_gets(struct ioqueue *ioq, char *buf, int cc);
+extern int ioq_puts(struct ioqueue *ioq, char *buf);
 
 #endif
diff --git a/include/land.h b/include/land.h
index c66d48df..beb5d4df 100644
--- a/include/land.h
+++ b/include/land.h
@@ -201,22 +201,22 @@ enum {
 extern void lnd_sweep(struct emp_qelem *, int, int, natid);
 extern int lnd_interdict(struct emp_qelem *, coord, coord, natid);
 extern void lnd_sel(struct nstr_item *, struct emp_qelem *);
-extern void lnd_mess(s_char *, struct llist *);
+extern void lnd_mess(char *, struct llist *);
 extern int lnd_check_mines(struct emp_qelem *);
 extern double lnd_mobcost(struct lndstr *, struct sctstr *, int);
-extern s_char *lnd_path(int, struct lndstr *, s_char *);
+extern char *lnd_path(int, struct lndstr *, char *);
 
 extern int attack_val(int, struct lndstr *);
 extern int total_mil(struct lndstr *);
 extern int defense_val(struct lndstr *);
 extern int lnd_getmil(struct lndstr *);
-extern void lnd_print(struct llist *, s_char *);
-extern void lnd_delete(struct llist *, s_char *);
+extern void lnd_print(struct llist *, char *);
+extern void lnd_delete(struct llist *, char *);
 extern int lnd_take_casualty(int, struct llist *, int);
 extern void lnd_submil(struct lndstr *, int);
 extern void lnd_takemob(struct emp_qelem *, double);
 extern int lnd_spyval(struct lndstr *);
-extern int intelligence_report(int, struct lndstr *, int, s_char *);
+extern int intelligence_report(int, struct lndstr *, int, char *);
 extern int count_sect_units(struct sctstr *);
 extern void count_units(struct shpstr *);
 extern void lnd_count_units(struct lndstr *);
diff --git a/include/map.h b/include/map.h
index 5f75eb1f..249b8339 100644
--- a/include/map.h
+++ b/include/map.h
@@ -39,13 +39,13 @@
 
 #define	MAPWIDTH(persec) ((WORLD_X/2)*(persec + 1)+1)
 
-extern void blankfill(s_char *, register struct range *, int);
+extern void blankfill(char *, struct range *, int);
 /* src/lib/subs/border.c */
 extern int map_set(natid, coord, coord, s_char, int);
 extern void writebmap(natid);
 extern void writemap(natid);
 /* src/lib/subs/border.c */
-extern void border(struct range *, s_char *, s_char *);
+extern void border(struct range *, char *, char *);
 
 #define MAP_SHIP	bit(0)
 #define MAP_LAND	bit(1)
diff --git a/include/plane.h b/include/plane.h
index 6035bf1e..3f556c33 100644
--- a/include/plane.h
+++ b/include/plane.h
@@ -162,7 +162,7 @@ struct shiplist {
 
 /* src/lib/subs/aircombat.c */
 extern void ac_planedamage(struct plist *, natid, int, natid, int,
-			   int, s_char *);
+			   int, char *);
 extern void ac_intercept(struct emp_qelem *, struct emp_qelem *,
 			 struct emp_qelem *, natid, coord, coord);
 extern void ac_combat_headers(natid, natid);
@@ -173,7 +173,7 @@ extern void ac_landflak(struct emp_qelem *, coord, coord);
 extern void ac_fireflak(struct emp_qelem *, natid, natid, int);
 extern int ac_flak_dam(int);
 extern void ac_encounter(struct emp_qelem *, struct emp_qelem *, coord,
-			 coord, s_char *, int, int,
+			 coord, char *, int, int,
 			 struct emp_qelem *, struct emp_qelem *);
 extern int ac_isflying(struct plnstr *, struct emp_qelem *);
 extern int do_evade(struct emp_qelem *, struct emp_qelem *);
diff --git a/include/prototypes.h b/include/prototypes.h
index d1b19871..97559e7e 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -71,11 +71,11 @@ extern int nav_map(int, int, 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,
+extern void resnoise(struct sctstr *sptr, int public_amt, char *name,
 		     int old, int new);
 extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
 extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
-extern s_char *prsub(struct shpstr *);
+extern char *prsub(struct shpstr *);
 extern int check_trade(void);
 extern int ontradingblock(int, void *);
 extern void trdswitchown(int, void *, int);
@@ -312,7 +312,7 @@ extern void logerror(char *, ...) ATTRIBUTE((format (printf, 1, 2)));
 extern int draw_map(int, s_char, int, struct nstr_sect *);
 extern int unit_map(int, int, struct nstr_sect *, s_char *);
 extern int bmaps_intersect(natid, natid);
-extern int share_bmap(natid, natid, struct nstr_sect *, s_char, s_char *);
+extern int share_bmap(natid, natid, struct nstr_sect *, char, char *);
 /* move.c */
 /* in path.h */
 /* nstr_subs.c */
@@ -321,13 +321,13 @@ extern int share_bmap(natid, natid, struct nstr_sect *, s_char, s_char *);
 extern void bp_enable_cachepath(void);
 extern void bp_disable_cachepath(void);
 extern void bp_clear_cachepath(void);
-extern s_char *BestDistPath(s_char *, struct sctstr *, struct sctstr *,
-			    double *, int);
-extern s_char *BestLandPath(s_char *, struct sctstr *, struct sctstr *,
-			    double *, int);
-extern s_char *BestShipPath(s_char *, int, int, int, int, int);
-extern s_char *BestAirPath(s_char *, int, int, int, int);
-extern double pathcost(struct sctstr *, s_char *, int);
+extern char *BestDistPath(char *, struct sctstr *, struct sctstr *,
+			  double *, int);
+extern char *BestLandPath(char *, struct sctstr *, struct sctstr *,
+			  double *, int);
+extern char *BestShipPath(char *, int, int, int, int, int);
+extern char *BestAirPath(char *, int, int, int, int);
+extern double pathcost(struct sctstr *, char *, int);
 /* res_pop.c */
 extern int max_population(float, int, int);
 extern int max_pop(float, struct sctstr *);
@@ -382,18 +382,18 @@ extern int diffy(int, int);
 extern int deltax(int, int);
 extern int deltay(int, int);
 extern int mapdist(int, int, int, int);
-extern s_char *effadv(int);
-extern int onearg(s_char *, s_char *);
+extern char *effadv(int);
+extern int onearg(char *, char *);
 extern int parse(char *, char **, char **, char *, char **);
 extern int ldround(double, int);
 extern int roundintby(int, int);
 extern int scthash(register int, register int, int);
 extern int tcp_listen(char *, char *, size_t *);
-extern s_char *numstr(s_char buf[], int n);
+extern char *numstr(char buf[], int n);
 /* plur.c */
-extern s_char *esplur(int n);
-extern s_char *splur(int n);
-extern s_char *iesplur(int n);
+extern char *esplur(int n);
+extern char *splur(int n);
+extern char *iesplur(int n);
 extern char *plurize(char *buf, int max_len, int n);
 /* more in misc.h */
 
@@ -432,8 +432,8 @@ extern int init_nats(void);
 /* login.c */
 extern void player_login(void *);
 /* nat.c */
-extern int natbyname(s_char *, natid *);
-extern int natpass(int, s_char *);
+extern int natbyname(char *, natid *);
+extern int natpass(int, char *);
 /* player.c */
 extern struct player *player;	/* current player's context */
 extern char *praddr(struct player *);
@@ -451,15 +451,15 @@ extern void stop_service(void);
  * src/lib/subs/ *.c 
  */
 /* askyn.c */
-extern int confirm(s_char *);
-extern int askyn(s_char *);
+extern int confirm(char *);
+extern int askyn(char *);
 /* bsanct.c */
 extern void bsanct(void);
 /* caploss.c */
-extern void caploss(struct sctstr *, natid, s_char *);
+extern void caploss(struct sctstr *, natid, char *);
 /* chkmoney.c */
-extern int chkmoney(long, long, s_char *);
-extern int check_cost(int, int, long, int *, s_char *);
+extern int chkmoney(long, long, char *);
+extern int check_cost(int, int, long, int *, char *);
 /* cnumb.c */
 extern int cnumb(char *);
 /* coastal.c */
@@ -488,7 +488,7 @@ extern void bitinit2(struct nstr_sect *, unsigned char *, int);
 /* getele.c */
 extern int getele(char *, char *);
 /* land.c */
-extern s_char *prland(struct lndstr *);
+extern char *prland(struct lndstr *);
 extern int lnd_postread(int, void *);
 extern int lnd_prewrite(int, void *);
 extern void lnd_init(int, void *);
@@ -505,15 +505,15 @@ extern int planesatxy(coord, coord, int, int, struct emp_qelem *);
 extern int asw_shipsatxy(coord, coord, int, int, struct plnstr *,
 			 struct shiplist **);
 extern int num_shipsatxy(coord, coord, int, int);
-extern int islist(s_char *);
+extern int islist(char *);
 /* src/lib/subs/mission.c */
-extern s_char *mission_name(short);
-extern s_char *nameofitem(struct genitem *, int);
+extern char *mission_name(short);
+extern char *nameofitem(struct genitem *, int);
 extern int collateral_damage(coord, coord, int, struct emp_qelem *);
 extern int mission_pln_equip(struct plist *, struct ichrstr *, int,
 			     s_char);
-extern int ground_interdict(coord, coord, natid, s_char *);
-extern int unit_interdict(coord, coord, natid, s_char *, int, int);
+extern int ground_interdict(coord, coord, natid, char *);
+extern int unit_interdict(coord, coord, natid, char *, int, int);
 extern int off_support(coord, coord, natid, natid);
 extern int def_support(coord, coord, natid, natid);
 extern int oprange(struct genitem *, int, int *);
@@ -531,14 +531,14 @@ extern int fly_map(coord, coord);
 /* mslsub.c */
 extern int msl_intercept(coord, coord, natid, int, int, int, int);
 extern int msl_equip(struct plnstr *);
-extern int msl_hit(struct plnstr *, int, int, int, int, s_char *,
+extern int msl_hit(struct plnstr *, int, int, int, int, char *,
 		   coord, coord, int);
 extern void msl_sel(struct emp_qelem *, coord, coord, natid, int,
 		    int, int);
 extern int msl_launch_mindam(struct emp_qelem *, coord, coord, int,
-			     int, int, s_char *, int, int);
+			     int, int, char *, int, int);
 /* mtch.c */
-extern int comtch(register s_char *, struct cmndstr *, int);
+extern int comtch(char *, struct cmndstr *, int);
 /* natarg.c */
 extern struct natstr *natargp(char *, char *);
 extern int natarg(char *, char *);
@@ -559,7 +559,7 @@ extern int nxtitem(struct nstr_item *, void *);
 /* nxtsct.c */
 extern int nxtsct(struct nstr_sect *, struct sctstr *);
 /* plane.c */
-extern s_char *prplane(struct plnstr *);
+extern char *prplane(struct plnstr *);
 extern int pln_postread(int, void *);
 extern int pln_prewrite(int, void *);
 extern void pln_init(int, void *);
@@ -652,9 +652,9 @@ extern void sathead(void);
 extern int sct_postread(int, void *);
 extern int sct_prewrite(int, void *);
 extern void item_prewrite(short *);
-extern int issector(s_char *);
+extern int issector(char *);
 /* ship.c */
-extern s_char *prship(struct shpstr *);
+extern char *prship(struct shpstr *);
 extern int shp_postread(int, void *);
 extern int shp_prewrite(int, void *);
 extern void shp_init(int, void *);
@@ -682,7 +682,7 @@ extern void show_news(int);
 extern void shp_sel(struct nstr_item *, struct emp_qelem *);
 extern void shp_nav(struct emp_qelem *, double *, double *, int *, natid);
 extern int shp_sweep(struct emp_qelem *, int, natid);
-extern s_char *shp_path(int, struct shpstr *, s_char *);
+extern char *shp_path(int, struct shpstr *, char *);
 extern void shp_put(struct emp_qelem *, natid);
 extern void shp_list(struct emp_qelem *);
 extern int shp_check_nav(struct sctstr *, struct shpstr *);
@@ -731,7 +731,7 @@ extern void delete_old_announcements(void);
 /* deliver.c */
 extern void dodeliver(struct sctstr *);
 /* distribute.c */
-extern int dodistribute(struct sctstr *, int, s_char *, double, double);
+extern int dodistribute(struct sctstr *, int, char *, double, double);
 /* finish.c */
 extern void finish_sects(int);
 /* human.c */
diff --git a/include/tel.h b/include/tel.h
index 6aedcfe9..4b090603 100644
--- a/include/tel.h
+++ b/include/tel.h
@@ -51,6 +51,6 @@ struct telstr {
     time_t tel_date;		/* when sent */
 };
 
-extern s_char *mailbox(s_char *buf, natid cn);
+extern char *mailbox(char *buf, natid cn);
 
 #endif
diff --git a/include/trade.h b/include/trade.h
index 7330bfd4..5739c5bf 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -66,7 +66,7 @@ union trdgenstr {
 
 extern int trade_check_ok(struct trdstr *, union trdgenstr *);
 extern int trade_check_item_ok(union trdgenstr *);
-extern s_char *trade_nameof(struct trdstr *, union trdgenstr *);
+extern char *trade_nameof(struct trdstr *, union trdgenstr *);
 extern int trade_desc(struct trdstr *, union trdgenstr *);
 extern int trade_getitem(struct trdstr *, union trdgenstr *);
 extern long get_couval(int);
diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c
index ef76ef9c..69aecb9d 100644
--- a/src/lib/commands/arm.c
+++ b/src/lib/commands/arm.c
@@ -54,14 +54,14 @@ arm(void)
     struct plnstr pl;
     struct plnstr start;	/* Used for sanity checking */
     struct nukstr nuke;
-    s_char *p;
+    char *p;
     int pno;
     int nuketype;
     int found;
     struct nstr_item ni;
-    s_char buf[1024];
+    char buf[1024];
     int disarm = **player->argp == 'd';
-    s_char *prompt = disarm ? "Disarm plane: " : "Arm plane: ";
+    char *prompt = disarm ? "Disarm plane: " : "Arm plane: ";
 
     if (!(p = getstarg(player->argp[1], prompt, buf)) || !*p)
 	return RET_SYN;
diff --git a/src/lib/commands/army.c b/src/lib/commands/army.c
index d101ffdd..c99f1f95 100644
--- a/src/lib/commands/army.c
+++ b/src/lib/commands/army.c
@@ -46,12 +46,12 @@ army(void)
 {
     struct lndstr land;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
     struct nstr_item ni;
     struct lndstr land2;
-    s_char buf[1024];
+    char buf[1024];
 
     cp = getstarg(player->argp[1], "army? ", buf);
     if (cp == 0)
diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c
index 1e77254b..325e0b98 100644
--- a/src/lib/commands/assa.c
+++ b/src/lib/commands/assa.c
@@ -60,8 +60,8 @@ assa(void)
     int a_spy = 0;		/* the best assaulter scout */
     double osupport = 1.0;	/* assault support */
     double dsupport = 1.0;	/* defense support */
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int n;
     int ourtotal;
     struct emp_qelem *qp, *next;
diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c
index f633889c..db7d5252 100644
--- a/src/lib/commands/atta.c
+++ b/src/lib/commands/atta.c
@@ -65,8 +65,8 @@ atta(void)
     double osupport = 1.0;	/* attack support */
     double dsupport = 1.0;	/* defense support */
     int last, n;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int rel;
 
     att_combat_init(def, EF_SECTOR);
diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c
index 8c5579e4..20186424 100644
--- a/src/lib/commands/bdes.c
+++ b/src/lib/commands/bdes.c
@@ -45,11 +45,11 @@
 int
 bdes(void)
 {
-    s_char *p, d;
+    char *p, d;
     struct nstr_sect nstr;
     struct sctstr sect;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     int changed = 0;
 
     if (!snxtsct(&nstr, player->argp[1]))
diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c
index 0b4212f4..2eee317c 100644
--- a/src/lib/commands/best.c
+++ b/src/lib/commands/best.c
@@ -46,10 +46,10 @@ int
 best(void)
 {
     double cost;
-    s_char *s;
+    char *s;
     struct sctstr s1, s2;
     struct nstr_sect nstr, nstr2;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c
index c39a9dc1..08db07e8 100644
--- a/src/lib/commands/boar.c
+++ b/src/lib/commands/boar.c
@@ -63,8 +63,8 @@ boar(void)
     struct lndstr land;
     struct nstr_item ni;
     int foundland;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_SHIP);
     /*
diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index c836bad2..4a2cbf06 100644
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -86,13 +86,13 @@ static int nbomb = sizeof(bombcomm) / sizeof(*bombcomm);
 int
 bomb(void)
 {
-    s_char *p;
+    char *p;
     int mission_flags;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
@@ -100,10 +100,10 @@ bomb(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char mission;
+    char mission;
     int rel;
     struct natstr *natp;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
@@ -202,13 +202,13 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
     int nships;
     int type;
     int bad;
-    s_char *p;
+    char *p;
     struct plist *plp;
     int nsubs;
     int nunits;
     struct natstr *natp;
     int rel;
-    s_char buf[1024];
+    char buf[1024];
     int i;
 
     bad = 0;
@@ -473,7 +473,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
     struct plist *plp;
     struct mchrstr *mcp;
     int dam;
-    s_char *q;
+    char *q;
     int n;
     struct emp_qelem *qp;
     int shipno;
@@ -481,8 +481,8 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
     struct shpstr ship;
     int nships = 0;
     struct shiplist *head = NULL;
-    s_char buf[1024];
-    s_char prompt[128];
+    char buf[1024];
+    char prompt[128];
     int hitchance;
     int nukedam;
     int flak;
@@ -614,7 +614,7 @@ static void
 plane_bomb(struct emp_qelem *list, struct sctstr *target)
 {
     int dam;
-    s_char *q;
+    char *q;
     int n;
     natid own;
     struct plnstr plane;
@@ -622,8 +622,8 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
     int planeno;
     int ignore;
     struct plist *plp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     int hitchance;
     int nukedam;
     int nplanes;
@@ -724,11 +724,11 @@ static void
 land_bomb(struct emp_qelem *list, struct sctstr *target)
 {
     int dam;
-    s_char *q;
+    char *q;
     int n;
     natid own;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     struct lndstr land;
     struct emp_qelem *qp;
     int unitno;
@@ -862,7 +862,7 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
 		    int flak)
 {
     int disp;
-    s_char dmess[255];
+    char dmess[255];
     int eff;
     struct shpstr ship;
     struct lndstr land;
diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 9924704a..b95aaa3c 100644
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -86,11 +86,11 @@ buil(void)
     struct mchrstr *mp;
     struct plchrstr *pp;
     struct nchrstr *np;
-    s_char *p;
+    char *p;
     int gotsect = 0;
     int built;
     int number;
-    s_char buf[1024];
+    char buf[1024];
 
     natp = getnatp(player->cnum);
     if ((p =
@@ -221,7 +221,7 @@ buil(void)
 	if (player->argp[4]) {
 	    number = atoi(player->argp[4]);
 	    if (number > 20) {
-		s_char bstr[80];
+		char bstr[80];
 		sprintf(bstr,
 			"Are you sure that you want to build %s of them? ",
 			player->argp[4]);
@@ -536,8 +536,8 @@ build_bridge(struct sctstr *sp, short *vec)
     int newx, newy;
     int avail;
     int nx, ny, i, good = 0;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (opt_EASY_BRIDGES == 0) {	/* must have a bridge head or tower */
 	if (sp->sct_type != SCT_BTOWER) {
@@ -801,8 +801,8 @@ build_tower(struct sctstr *sp, short *vec)
     int val;
     int newx, newy;
     int avail;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     int good;
     int i;
     int nx;
diff --git a/src/lib/commands/buy.c b/src/lib/commands/buy.c
index bc33836c..d2962b69 100644
--- a/src/lib/commands/buy.c
+++ b/src/lib/commands/buy.c
@@ -75,7 +75,7 @@ buy(void)
     time_t now;
     double tally;
     double canspend;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");
diff --git a/src/lib/commands/cede.c b/src/lib/commands/cede.c
index fd218db5..18e16f96 100644
--- a/src/lib/commands/cede.c
+++ b/src/lib/commands/cede.c
@@ -61,11 +61,11 @@ cede(void)
     natid to;
     int n;
     int is_sector = 0, is_ship = 0;
-    s_char *p;
+    char *p;
     struct nstr_sect ns;
     struct nstr_item ni;
     struct natstr *natp;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((p = getstarg(player->argp[1], "Cede what? ", buf)) == 0)
 	return RET_SYN;
diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c
index fc36a4bb..f1eb26c9 100644
--- a/src/lib/commands/chan.c
+++ b/src/lib/commands/chan.c
@@ -45,14 +45,14 @@
 int
 chan(void)
 {
-    s_char *temp;
+    char *temp;
     struct natstr *natp;
-    register s_char *p;
+    char *p;
     natid cn;
     int charge;
     int nonb;
     int btucost;
-    s_char buf[1024];
+    char buf[1024];
     struct natstr *us;
 
     if ((p =
diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index 54de5b63..762994c3 100644
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.c
@@ -48,7 +48,7 @@ int
 comm(void)
 {
     struct sctstr sect;
-    s_char dirstr[12];
+    char dirstr[12];
     int nsect;
     int n;
     struct nstr_sect nstr;
diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c
index 4d364c85..f20e8e89 100644
--- a/src/lib/commands/cons.c
+++ b/src/lib/commands/cons.c
@@ -51,8 +51,8 @@
 struct ltcomstr {
     int type;			/* EF_LOAN or EF_TREATY */
     int num;			/* number */
-    s_char *name;		/* "loan" or "treaty" */
-    s_char *Name;		/* "Loan" or "Treaty" */
+    char *name;			/* "loan" or "treaty" */
+    char *Name;			/* "Loan" or "Treaty" */
     natid proposer;		/* country offering */
     natid proposee;		/* country offered to */
     natid mailee;		/* who gets mail about it */
@@ -113,11 +113,11 @@ static int
 cons_choose(struct ltcomstr *ltcp)
 {
     static int lon_or_trt[] = { EF_LOAN, EF_TREATY, EF_BAD };
-    s_char *p;
+    char *p;
     struct lonstr *lp;
     struct trtstr *tp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     memset(ltcp, 0, sizeof(*ltcp));
     if (getstarg(player->argp[1], "loan or treaty? ", buf) == 0)
diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c
index 73930dbc..1d74fbba 100644
--- a/src/lib/commands/cuto.c
+++ b/src/lib/commands/cuto.c
@@ -49,7 +49,7 @@ cuto(void)
     int nsect;
     int n;
     struct nstr_sect nstr;
-    s_char dirstr[12];
+    char dirstr[12];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index e438a85a..266603b7 100644
--- a/src/lib/commands/decl.c
+++ b/src/lib/commands/decl.c
@@ -49,8 +49,8 @@ decl(void)
     int rel;
     int who;
     struct nstr_item ni;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "alliance, friendly, neutrality, hostility, or war? ",
diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index fd1f8604..2034ebcd 100644
--- a/src/lib/commands/deli.c
+++ b/src/lib/commands/deli.c
@@ -53,9 +53,9 @@ deli(void)
     int thresh;
     int sx, sy;
     struct nstr_sect nstr;
-    s_char buf[1024];
-    s_char prompt[128];
-    s_char *p;
+    char buf[1024];
+    char prompt[128];
+    char *p;
 
     if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0)
 	return RET_SYN;
diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index 91779c18..9dad2930 100644
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.c
@@ -48,7 +48,7 @@
  */
 
 static long do_demo(struct natstr *natp, struct nstr_sect nstr, int number,
-		    s_char *p, int for_real);
+		    char *p, int for_real);
 
 int
 demo(void)
@@ -57,8 +57,8 @@ demo(void)
     long cash;
     long cost;
     int number;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     struct nstr_sect nstr;
 
     natp = getnatp(player->cnum);
@@ -80,7 +80,7 @@ demo(void)
 }
 
 static long
-do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
+do_demo(struct natstr *natp, struct nstr_sect nstr, int number, char *p,
 	int for_real)
 {
     struct sctstr sect;
diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c
index 2f25e54e..8a201552 100644
--- a/src/lib/commands/desi.c
+++ b/src/lib/commands/desi.c
@@ -44,7 +44,7 @@
 #include "optlist.h"
 #include "commands.h"
 
-static long do_desi(struct natstr *natp, s_char *sects, s_char *deschar,
+static long do_desi(struct natstr *natp, char *sects, char *deschar,
 		    long int cash, int for_real);
 
 int
@@ -67,11 +67,11 @@ desi(void)
 }
 
 static long
-do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash,
+do_desi(struct natstr *natp, char *sects, char *deschar, long int cash,
 	int for_real)
 {
     int n;
-    s_char *p;
+    char *p;
     int breaksanct;
     int cap_x;
     int cap_y;
@@ -79,8 +79,8 @@ do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash,
     struct nstr_sect nstr;
     struct sctstr sect;
     struct sctstr check;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     long cost = 0;
     int changed = 0;
     int warned = 0;
diff --git a/src/lib/commands/dist.c b/src/lib/commands/dist.c
index c4c68131..65560e4b 100644
--- a/src/lib/commands/dist.c
+++ b/src/lib/commands/dist.c
@@ -53,10 +53,10 @@ dist(void)
 {
     struct sctstr sect, dsect, tsect;
     struct nstr_sect nstr;
-    s_char *path, *p;
+    char *path, *p;
     double move_cost = 0.0;
     coord dstx, dsty;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index 924a11ae..2ade523e 100644
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -54,7 +54,7 @@ drop(void)
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
@@ -62,7 +62,7 @@ drop(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
diff --git a/src/lib/commands/dump.c b/src/lib/commands/dump.c
index d35bbdac..f36b2d20 100644
--- a/src/lib/commands/dump.c
+++ b/src/lib/commands/dump.c
@@ -49,7 +49,7 @@ int
 dump(void)
 {
     struct sctstr sect;
-    s_char dirstr[20];
+    char dirstr[20];
     int nsect;
     int n, i;
     struct nstr_sect nstr;
diff --git a/src/lib/commands/enli.c b/src/lib/commands/enli.c
index df89f289..ca3a73a4 100644
--- a/src/lib/commands/enli.c
+++ b/src/lib/commands/enli.c
@@ -55,10 +55,10 @@ enli(void)
     int milwant;
     int totalmil;
     long reserve;
-    s_char *p;
+    char *p;
     int quota;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/flee.c b/src/lib/commands/flee.c
index eff890e3..50ea41db 100644
--- a/src/lib/commands/flee.c
+++ b/src/lib/commands/flee.c
@@ -46,12 +46,12 @@ flee(void)
 {
     struct shpstr ship;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
     struct nstr_item ni;
     struct shpstr ship2;
-    s_char buf[1024];
+    char buf[1024];
 
     cp = getstarg(player->argp[1], "fleet? ", buf);
     if (cp == 0)
diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index a7e0db40..d5f1b72e 100644
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -55,7 +55,7 @@ fly(void)
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct shpstr ship;
     int cno;
     struct nstr_item ni_bomb;
@@ -67,7 +67,7 @@ fly(void)
     struct sctstr ap_sect;
     int dst_type;
     s_char *dst_ptr;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index 16b5f03c..df60a181 100644
--- a/src/lib/commands/foll.c
+++ b/src/lib/commands/foll.c
@@ -48,11 +48,11 @@ int
 foll(void)
 {
     struct shpstr ship;
-    s_char *cp;
+    char *cp;
     int good, leader, count = 0;
     coord x, y;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_SAIL) {
 	pr("The SAIL option is not enabled, so this command is not valid.\n");
diff --git a/src/lib/commands/fort.c b/src/lib/commands/fort.c
index 732f15bc..d15ea1e5 100644
--- a/src/lib/commands/fort.c
+++ b/src/lib/commands/fort.c
@@ -48,8 +48,8 @@ fort(void)
     struct nstr_item ni;
     struct lndstr land;
     int fort_amt, hard_amt;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/fuel.c b/src/lib/commands/fuel.c
index dc5336b2..1917e1dc 100644
--- a/src/lib/commands/fuel.c
+++ b/src/lib/commands/fuel.c
@@ -62,7 +62,7 @@ fuel(void)
     int type;
     struct mchrstr *mp;
     struct lchrstr *lcp;
-    s_char *p;
+    char *p;
     int fueled;
     int land_fuel, ship_fuel;
     int oil_amt, pet_amt, fuel_amt, tot_fuel, max_amt;
@@ -73,8 +73,8 @@ fuel(void)
     int harbor, sector;
     int fuelled_ship = -1;
     struct nstr_item tender, ltender;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (opt_FUEL == 0) {
 	pr("Option 'FUEL' not enabled\n");
diff --git a/src/lib/commands/give.c b/src/lib/commands/give.c
index cc9b4b36..94b0a63c 100644
--- a/src/lib/commands/give.c
+++ b/src/lib/commands/give.c
@@ -56,9 +56,9 @@ give(void)
     int amt;
     struct ichrstr *ip;
     int m, n;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "which commodity? ")))
 	return RET_SYN;
diff --git a/src/lib/commands/grin.c b/src/lib/commands/grin.c
index f9e50829..a2d44c72 100644
--- a/src/lib/commands/grin.c
+++ b/src/lib/commands/grin.c
@@ -48,10 +48,10 @@ grin(void)
 {
     struct nstr_sect nstr;
     struct sctstr sect;
-    s_char *p;
+    char *p;
     int i, n, qty;
     int avail;
-    s_char buf[1024];
+    char buf[1024];
     double grind_eff = 0.8;
 
     if ((p = getstarg(player->argp[1], "Sectors? ", buf)) == 0)
diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index 12ce0270..da69a547 100644
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.c
@@ -54,12 +54,12 @@ hard(void)
     struct plchrstr *pcp;
     struct plnstr pln;
     int level;
-    s_char *p;
+    char *p;
     int hcm;
     int n;
     struct nstr_item ni;
     struct sctstr sect;
-    s_char buf[1024];
+    char buf[1024];
     long cash;
     struct natstr *natp;
 
diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c
index 9e9d4675..9a8ad28d 100644
--- a/src/lib/commands/improve.c
+++ b/src/lib/commands/improve.c
@@ -56,9 +56,9 @@ improve(void)
     struct sctstr sect;
     int nsect;
     struct nstr_sect nstr;
-    s_char *p;
-    s_char buf[1024];
-    s_char inbuf[128];
+    char *p;
+    char buf[1024];
+    char inbuf[128];
     int type;
     int value;
     int ovalue;
diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c
index 25887535..f62ee0ae 100644
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -52,14 +52,14 @@
 #include "commands.h"
 #include "optlist.h"
 
-static s_char *
-lowerit(s_char *buf, int n, s_char *orig)
+static char *
+lowerit(char *buf, int n, char *orig)
 {				/* converts a string to lower case */
     /* lower case output buffer */
     /* size of output buffer */
     /* input strig */
     int i;
-    s_char *tmp;
+    char *tmp;
     tmp = buf;
     memset(buf, 0, n);
     for (i = 0; i < n && *orig; i++) {
@@ -73,14 +73,14 @@ lowerit(s_char *buf, int n, s_char *orig)
 int
 info(void)
 {
-    s_char buf[255];
+    char buf[255];
     FILE *fp;
-    s_char *name;
-    s_char *tmp_name;
+    char *name;
+    char *tmp_name;
     struct stat statb;
     struct dirent *dp;
-    s_char filename[1024];
-    s_char last[256];
+    char filename[1024];
+    char last[256];
     DIR *info_dp;
     int nmatch = 0;
     int width = 0;
@@ -172,11 +172,11 @@ int
 apro(void)
 {
     FILE *fp;
-    s_char *name, *lbp;
-    s_char *fbuf;
-    s_char *lbuf;
+    char *name, *lbp;
+    char *fbuf;
+    char *lbuf;
     struct dirent *dp;
-    s_char filename[1024];
+    char filename[1024];
     DIR *info_dp;
     long nf, nhf, nl, nlhl, nhl, nll;
     int alreadyhit;
@@ -277,17 +277,17 @@ apro(void)
     return RET_OK;
 }
 
-#else
+#else  /* _WIN32 */
 
 int
 info(void)
 {
-    s_char buf[255];
+    char buf[255];
     FILE *fp;
-    s_char *name;
-    s_char *tmp_name;
-    s_char filename[1024];
-    s_char last[256];
+    char *name;
+    char *tmp_name;
+    char filename[1024];
+    char last[256];
     int nmatch = 0;
     int width = 0;
     char sep;
@@ -402,10 +402,10 @@ apro(void)
     HANDLE hDir;
     WIN32_FIND_DATA fData;
     FILE *fp;
-    s_char *name, *lbp;
-    s_char *fbuf;
-    s_char *lbuf;
-    s_char filename[1024];
+    char *name, *lbp;
+    char *fbuf;
+    char *lbuf;
+    char filename[1024];
     long nf, nhf, nl, nlhl, nhl, nll;
     int alreadyhit;
     int lhitlim;
@@ -504,4 +504,4 @@ apro(void)
     return RET_OK;
 }
 
-#endif
+#endif	/* _WIN32 */
diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index 50674552..3bba721b 100644
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -177,7 +177,7 @@ static int
 launch_as(struct plnstr *pp)
 {
     coord sx, sy;
-    s_char *cp, buf[1024];
+    char *cp, buf[1024];
     struct plnstr plane;
     struct nstr_item ni;
     int goodtarget;
@@ -243,14 +243,14 @@ launch_missile(struct plnstr *pp, int sublaunch)
     struct plchrstr *pcp = plchr + pp->pln_type;
     coord sx, sy;
     int n, dam;
-    s_char *cp;
+    char *cp;
     struct mchrstr *mcp;
     struct shpstr target_ship;
     struct sctstr sect;
     int nukedam;
     int rel;
     struct natstr *natp;
-    s_char buf[1024];
+    char buf[1024];
 
     if (pcp->pl_flags & P_MAR)
 	cp = getstarg(player->argp[2], "Target ship? ", buf);
@@ -380,9 +380,9 @@ launch_sat(struct plnstr *pp, int sublaunch)
     int i;
     int dist;
     int dir;
-    s_char *cp;
-    s_char *p;
-    s_char buf[1024];
+    char *cp;
+    char *p;
+    char buf[1024];
 
     pr("\n");
     cp = getstarg(player->argp[2], "Target sector? ", buf);
diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c
index 12efbc56..03ed71c4 100644
--- a/src/lib/commands/lboard.c
+++ b/src/lib/commands/lboard.c
@@ -59,8 +59,8 @@ lboa(void)
     int a_spy = 0;		/* the best boarder scout */
     struct sctstr sect;
     struct lndstr land;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_LAND);
     /*
diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index 6f0cc235..82cbdb7a 100644
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -84,8 +84,8 @@ load(void)
     struct sctstr sect;
     struct shpstr ship;
     int retval;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "What commodity (or 'plane' or 'land')? ", buf))
@@ -223,8 +223,8 @@ lload(void)
     struct sctstr sect;
     struct lndstr land;
     int retval;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "What commodity (or 'plane' or 'land')? ", buf))
@@ -371,9 +371,9 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
     struct nstr_item ni;
     struct plnstr pln;
     int loaded = 0;
-    s_char buf[1024];
-    s_char *p;
-    s_char prompt[512];
+    char buf[1024];
+    char *p;
+    char prompt[512];
     struct mchrstr *mcp = mchr + sp->shp_type;
 
     if (!(mcp->m_flags & (M_CHOPPER | M_XLIGHT | M_FLY | M_MSL))) {
@@ -504,9 +504,9 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
     struct lndstr land;
     struct plnstr plane;
     int loaded = 0;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
     int load_spy = 0;
 
     count_units(sp);
@@ -724,9 +724,9 @@ load_comm_ship(struct sctstr *sectp, struct shpstr *sp,
     struct mchrstr *mcp = &mchr[(int)sp->shp_type];
     int ship_amt, ship_max, sect_amt, move_amt;
     int amount;
-    s_char prompt[512];
-    s_char *p;
-    s_char buf[1024];
+    char prompt[512];
+    char *p;
+    char buf[1024];
 
     sprintf(prompt, "Number of %s to %s %s at %s? ",
 	    ich->i_name,
@@ -801,9 +801,9 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
     struct nstr_item ni;
     struct plnstr pln;
     int loaded = 0;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
 
     if (!lp->lnd_maxlight) {
 	if (noisy)
@@ -917,9 +917,9 @@ load_comm_land(struct sctstr *sectp, struct lndstr *lp,
     struct lchrstr *lcp = &lchr[(int)lp->lnd_type];
     int land_amt, land_max, sect_amt, move_amt;
     int amount;
-    s_char prompt[512];
-    s_char *p;
-    s_char buf[1024];
+    char prompt[512];
+    char *p;
+    char buf[1024];
 
     sprintf(prompt, "Number of %s to %s %s at %s? ",
 	    ich->i_name,
@@ -999,9 +999,9 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
     struct lndstr land;
     struct plnstr plane;
     int loaded = 0;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
 
     lnd_count_units(lp);
 
diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index 7e338e17..2dd641b4 100644
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -67,8 +67,8 @@ ltend(void)
     int maxtarget;
     int transfer;
     int total;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "Transfer what commodity? ")))
 	return RET_SYN;
diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c
index d88ff1dc..7f0505b4 100644
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -49,7 +49,7 @@
 int
 map(void)
 {
-    register s_char *b;
+    char *b;
     int unit_type = 0;
     int bmap = 0;
     struct nstr_sect ns;
diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index ac023153..41bc9fc8 100644
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -54,15 +54,15 @@ march(void)
     struct emp_qelem land_list;
     double minmob, maxmob;
     int together;
-    s_char *cp = 0;
+    char *cp = 0;
     struct lndstr *lnd = 0;	/* leader */
     struct nstr_sect ns;
     s_char origin;
     int dir;
     int stopping = 0;
     int skip = 0;
-    s_char buf[1024];
-    s_char prompt[128];
+    char buf[1024];
+    char prompt[128];
 
     if (!snxtitem(&ni_land, EF_LAND, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index 8d83fc0f..db046650 100644
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -88,8 +88,8 @@ int
 multifire(void)
 {
     static int ef_with_guns[] = { EF_SECTOR, EF_SHIP, EF_LAND, EF_BAD };
-    s_char vbuf[20];
-    s_char *ptr;
+    char vbuf[20];
+    char *ptr;
     double range2, range;
     int trange;
     coord fx;
@@ -117,13 +117,13 @@ multifire(void)
     struct natstr *natp;
     struct nstr_item nbst;
     int type;
-    s_char *p;
+    char *p;
     int nfiring = 0;
     int ndefending = 0;
     union item_u item;
     struct emp_qelem fired, defended;
     double odds;
-    s_char buf[1024];
+    char buf[1024];
 
     emp_initque(&fired);
     emp_initque(&defended);
diff --git a/src/lib/commands/mine.c b/src/lib/commands/mine.c
index 1f130221..d67f12fb 100644
--- a/src/lib/commands/mine.c
+++ b/src/lib/commands/mine.c
@@ -105,7 +105,7 @@ landmine(void)
     int mines_wanted;
     int mines_laid;
     int total_mines_laid;
-    s_char prompt[128];
+    char prompt[128];
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c
index 623bd178..7eae1da1 100644
--- a/src/lib/commands/mobq.c
+++ b/src/lib/commands/mobq.c
@@ -48,10 +48,10 @@ int
 mobq(void)
 {
     struct shpstr ship;
-    s_char *cp, *oldmq;
+    char *cp, *oldmq;
     int good, mobquota, count = 0;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_SAIL) {
 	pr("The SAIL option is not enabled, so this command is not valid.\n");
diff --git a/src/lib/commands/mora.c b/src/lib/commands/mora.c
index 09271a7b..c4831d4b 100644
--- a/src/lib/commands/mora.c
+++ b/src/lib/commands/mora.c
@@ -50,9 +50,9 @@ morale(void)
     struct lndstr land;
     struct natstr *natp;
     int i, min;
-    s_char *p;
-    s_char mess[128];
-    s_char buf[1024];
+    char *p;
+    char mess[128];
+    char buf[1024];
 
     if (!snxtitem(&np, EF_LAND, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index 8fde5cf7..2cff13f6 100644
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -49,9 +49,9 @@ int
 name(void)
 {
     struct shpstr ship;
-    s_char *p;
+    char *p;
     struct nstr_item nb;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 7a14c956..ad7de063 100644
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -56,17 +56,17 @@ navi(void)
     struct emp_qelem ship_list;
     double minmob, maxmob;
     int together;
-    s_char *cp = 0;
+    char *cp = 0;
     struct shpstr *shp = 0;	/* flagship */
     struct nstr_sect ns;
     s_char origin;
     int dir;
     int stopping = 0;
     int skip = 0;
-    s_char buf[1024];
-    s_char prompt[128];
-    s_char pathtaken[1024];	/* Doubtful we'll have a path longer than this */
-    s_char *pt = pathtaken;
+    char buf[1024];
+    char prompt[128];
+    char pathtaken[1024];	/* Doubtful we'll have a path longer than this */
+    char *pt = pathtaken;
 
     if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/news.c b/src/lib/commands/news.c
index 6106a8a5..5444193b 100644
--- a/src/lib/commands/news.c
+++ b/src/lib/commands/news.c
@@ -64,8 +64,8 @@ news(void)
     short k;
     int sectors_were_taken = 0;
     natid i, j;
-    s_char num[128];
-    s_char *verb;
+    char num[128];
+    char *verb;
 
     if (!snxtitem(&nstr, EF_NEWS, "*"))
     	return RET_SYN;
@@ -176,11 +176,11 @@ news(void)
 static void
 preport(register struct nwsstr *np)
 {
-    register s_char *cp;
+    char *cp;
     register int i;
-    s_char buf[255];
-    s_char num[128];
-    s_char *ptr;
+    char buf[255];
+    char num[128];
+    char *ptr;
 
     cp = buf;
     sprintf(buf, "%-16.16s  ", ctime(&np->nws_when));
diff --git a/src/lib/commands/offe.c b/src/lib/commands/offe.c
index df945229..3c804ca0 100644
--- a/src/lib/commands/offe.c
+++ b/src/lib/commands/offe.c
@@ -51,8 +51,8 @@ static int do_loan(void);
 int
 offe(void)
 {
-    register s_char *cp;
-    s_char buf[1024];
+    char *cp;
+    char buf[1024];
 
     if (!(cp = getstarg(player->argp[1], "loan or treaty? ", buf)) || !*cp)
 	return RET_SYN;
@@ -79,7 +79,7 @@ offe(void)
 static int
 do_treaty(void)
 {
-    register s_char *cp;
+    char *cp;
     register int ourcond;
     register int theircond;
     register int j;
@@ -90,8 +90,8 @@ do_treaty(void)
     time_t now;
     int n;
     struct natstr *natp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if ((n = natarg(player->argp[2], "Treaty offered to? ")) < 0)
 	return RET_SYN;
@@ -169,7 +169,7 @@ do_loan(void)
     struct lonstr loan;
     natid recipient;
     int n;
-    s_char prompt[128];
+    char prompt[128];
 
     if ((n = natarg(player->argp[2], "Lend to? ")) < 0)
 	return RET_SYN;
diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 3b6706a8..9bf9ce08 100644
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -78,10 +78,10 @@ orde(void)
     struct ichrstr *i1;
     coord p0x, p0y, p1x, p1y;
     int i;
-    s_char *p, *p1, *dest;
-    s_char buf1[128];
-    s_char buf[1024];
-    s_char prompt[128];
+    char *p, *p1, *dest;
+    char buf1[128];
+    char buf[1024];
+    char prompt[128];
 
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
 	return RET_SYN;
@@ -322,7 +322,7 @@ orde(void)
 }
 
 static void
-eta_calc(struct shpstr *sp, s_char *path, int *len, int *nupdates)
+eta_calc(struct shpstr *sp, char *path, int *len, int *nupdates)
 {
     double mobcost, mobil;
     int i;
@@ -423,10 +423,10 @@ sorde(void)
 {
     int nships = 0;
     int len, updates;
-    s_char *c;
+    char *c;
     struct nstr_item nb;
     struct shpstr ship;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index ca379706..4c0c7e52 100644
--- a/src/lib/commands/orig.c
+++ b/src/lib/commands/orig.c
@@ -45,9 +45,9 @@
 int
 orig(void)
 {
-    s_char *p;
+    char *p;
     coord x, y;
-    s_char buf[1024];
+    char buf[1024];
     natid cnum;
     struct natstr *np;
 
diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c
index 58b2b193..3ebbf3bb 100644
--- a/src/lib/commands/para.c
+++ b/src/lib/commands/para.c
@@ -59,7 +59,7 @@ para(void)
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
@@ -67,7 +67,7 @@ para(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = P_P;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c
index 2aeda497..61818ee7 100644
--- a/src/lib/commands/path.c
+++ b/src/lib/commands/path.c
@@ -58,13 +58,13 @@ path(void)
     coord cx, cy;
     int i;
     int y;
-    s_char *pp, *p;
+    char *pp, *p;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
     double move_cost;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "from sector : ", buf)) ||
 	!sarg_xy(p, &cx, &cy) || !getsect(cx, cy, &sect))
diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index de86bec6..bca1ddbd 100644
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -80,7 +80,7 @@ powe(void)
     int use_targets = 0;
     int got_targets = 0;
     int no_numbers = 0;
-    s_char *p;
+    char *p;
 
     memset(targets, 0, sizeof(targets));
     natp = getnatp(player->cnum);
diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index d94b002a..fbfd4d2c 100644
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -49,7 +49,7 @@
 int
 rada(void)
 {
-    s_char *cp;
+    char *cp;
     double tf;
     double tech;
     struct nstr_item ni;
@@ -58,7 +58,7 @@ rada(void)
     struct lndstr land;
     struct sctstr sect;
     int from_unit;
-    s_char buf[1024];
+    char buf[1024];
 
     from_unit = (**player->argp == 'l');
 
diff --git a/src/lib/commands/rang.c b/src/lib/commands/rang.c
index f50a8d0d..702be1c6 100644
--- a/src/lib/commands/rang.c
+++ b/src/lib/commands/rang.c
@@ -47,8 +47,8 @@ range(void)
     struct nstr_item np;
     struct plnstr plane;
     int i;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!snxtitem(&np, EF_PLANE, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/rea.c b/src/lib/commands/rea.c
index 8dcb61b8..392cf7ae 100644
--- a/src/lib/commands/rea.c
+++ b/src/lib/commands/rea.c
@@ -53,13 +53,13 @@
 int
 rea(void)
 {
-    static s_char *telnames[] = {
+    static char *telnames[] = {
 	/* must follow TEL_ defines in tel.h */
 	"Telegram", "Announcement", "BULLETIN", "Production Report"
     };
-    register s_char *p;
-    register s_char *mbox;
-    s_char mbox_buf[256];	/* Maximum path length */
+    char *p;
+    char *mbox;
+    char mbox_buf[256];		/* Maximum path length */
     struct telstr tgm;
     FILE *telfp;
     int teles;
@@ -72,7 +72,7 @@ rea(void)
     time_t lastdate;
     int header;
     int filelen;
-    s_char kind[80];
+    char kind[80];
     int n;
     int num = player->cnum;
     struct natstr *np = getnatp(player->cnum);
diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index 6aed692c..612b8c03 100644
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -52,7 +52,7 @@ reco(void)
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     int cno;
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
@@ -61,7 +61,7 @@ reco(void)
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
-    s_char buf[1024];
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
diff --git a/src/lib/commands/reje.c b/src/lib/commands/reje.c
index 9fda3b71..619a887e 100644
--- a/src/lib/commands/reje.c
+++ b/src/lib/commands/reje.c
@@ -45,12 +45,12 @@
 int
 reje(void)
 {
-    register s_char *p;
+    char *p;
     int rel;
     int do_undo;
     struct natstr nat;
     struct nstr_item ni;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((p = getstarg(player->argp[1], "reject or accept? ", buf)) == 0)
 	return RET_SYN;
diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c
index 9c7834e6..a41f2cbf 100644
--- a/src/lib/commands/rese.c
+++ b/src/lib/commands/rese.c
@@ -60,7 +60,7 @@ rese(void)
     char *p;
     float price;
     time_t now;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");
diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c
index dc617e2d..83d1029c 100644
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -47,7 +47,7 @@
 int
 retr(void)
 {
-    s_char *pq, *fl;
+    char *pq, *fl;
     int nships;
     struct nstr_item ni;
     struct shpstr ship;
@@ -55,8 +55,8 @@ retr(void)
     int rflags = -2;
     int zero;
     unsigned int x;
-    s_char buf1[1024];
-    s_char buf2[1024];
+    char buf1[1024];
+    char buf2[1024];
 
     if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
 	return RET_SYN;
@@ -195,15 +195,15 @@ retr(void)
 int
 lretr(void)
 {
-    s_char *pq, *fl;
+    char *pq, *fl;
     int nunits;
     struct nstr_item ni;
     struct lndstr land;
     int isarmy = 0;
     int rflags = -2;
     int zero;
-    s_char buf1[1024];
-    s_char buf2[1024];
+    char buf1[1024];
+    char buf2[1024];
     unsigned int x;
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
diff --git a/src/lib/commands/rout.c b/src/lib/commands/rout.c
index 3156056d..0e06bbbf 100644
--- a/src/lib/commands/rout.c
+++ b/src/lib/commands/rout.c
@@ -61,12 +61,12 @@ rout(void)
     int ry;
     i_type i_del;
     int dir;
-    s_char *p;
+    char *p;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
-    static s_char *buf = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
+    static char *buf = NULL;
     int i;
 
     if ((ip = whatitem(player->argp[1], "What item? ")) == 0)
diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index 1d97d36f..9cdba96d 100644
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -62,14 +62,14 @@ scra(void)
     struct mchrstr *mp;
     struct plchrstr *pp;
     struct lchrstr *lp;
-    s_char *p;
+    char *p;
     i_type i;
     struct nstr_item ni2;
     struct plnstr plane;
     struct lndstr land;
     struct sctstr sect2;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     float eff;
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
@@ -95,7 +95,7 @@ scra(void)
 	return RET_SYN;
     if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
 	      || islist(p))) {
-	s_char y_or_n[80], bbuf[80];
+	char y_or_n[80], bbuf[80];
 
 	memset(y_or_n, 0, sizeof(y_or_n));
 	if (type == EF_SHIP) {
diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index 7a4858d3..cab31c69 100644
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -64,7 +64,7 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     struct sctstr sect;
     struct mchrstr *mp;
     struct natstr *np;
-    s_char buf[512];
+    char buf[512];
     struct natstr *natp;
 
     mp = &mchr[(int)sp->shp_type];
@@ -138,9 +138,9 @@ scut(void)
     union item_u item;
     int type;
     struct mchrstr *mp;
-    s_char *p;
-    s_char prompt[128];
-    s_char buf[1024];
+    char *p;
+    char prompt[128];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
 	return RET_SYN;
@@ -165,7 +165,7 @@ scut(void)
 	return RET_SYN;
     if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
 	      || islist(p))) {
-	s_char y_or_n[80], bbuf[80];
+	char y_or_n[80], bbuf[80];
 
 	if (type == EF_SHIP) {
 	    if (*p == '*')
diff --git a/src/lib/commands/sect.c b/src/lib/commands/sect.c
index ba3471f5..c05a5c5c 100644
--- a/src/lib/commands/sect.c
+++ b/src/lib/commands/sect.c
@@ -54,13 +54,13 @@ sct(void)
     struct natstr *np;
     int ncond;
     int nsect;
-    s_char *ptr;
+    char *ptr;
     coord y, yval;
     int i;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
 
     nsect = 0;
     if (!snxtsct(&ns, player->argp[1]))
diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c
index ebb375d0..763b44d1 100644
--- a/src/lib/commands/sell.c
+++ b/src/lib/commands/sell.c
@@ -75,7 +75,7 @@ sell(void)
     time_t now;
     int ii = 0;
     coord x, y;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");
diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index 9c316d22..03cbf538 100644
--- a/src/lib/commands/set.c
+++ b/src/lib/commands/set.c
@@ -69,7 +69,7 @@ set(void)
     int foundslot;
     int id;
     time_t now;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");
diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 073b3bda..1c7a8810 100644
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -53,11 +53,11 @@ int
 setres(void)
 {
     struct sctstr sect;
-    s_char *what;
+    char *what;
     int amt;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if ((what = getstarg(player->argp[1],
 			 "Set What (iron, gold, oil, uranium, fertility)? ",
diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 777847fb..33935a45 100644
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -55,12 +55,12 @@ int
 setsector(void)
 {
     struct sctstr sect;
-    s_char *what;
+    char *what;
     int amt, current;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
-    s_char char0, char1;
+    char buf[1024];
+    char char0, char1;
 
     if ((what = getstarg(player->argp[1],
 			 "Give What (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ",
@@ -360,10 +360,10 @@ resbenefit(natid who, int good)
 }
 
 void
-resnoise(struct sctstr *sptr, int public_amt, s_char *name, int old,
+resnoise(struct sctstr *sptr, int public_amt, char *name, int old,
 	 int new)
 {
-    s_char p[100];
+    char p[100];
 
     pr("%s of %s changed from %d to %d%%\n",
        name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
diff --git a/src/lib/commands/show.c b/src/lib/commands/show.c
index c8748adb..772e4490 100644
--- a/src/lib/commands/show.c
+++ b/src/lib/commands/show.c
@@ -45,13 +45,13 @@
 int
 show(void)
 {
-    s_char *p;
+    char *p;
     void (*cfunc)(int);
     void (*sfunc)(int);
     void (*bfunc)(int);
     struct natstr *natp;
     int tlev;
-    s_char buf[1024];
+    char buf[1024];
     int rlev;
 
     if (!(p = getstarg(player->argp[1],
diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 0c7a8008..04769016 100644
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -141,7 +141,7 @@ showsat(struct sky **skypp, int x, int y)
     struct sky *todelete = 0;
     struct sky **prev;
     struct plchrstr *pcp;
-    s_char *name;
+    char *name;
     int nsat = 0;
 
     prev = 0;
diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c
index 2d01deda..a3ff2e7b 100644
--- a/src/lib/commands/strv.c
+++ b/src/lib/commands/strv.c
@@ -47,9 +47,9 @@
 #include "land.h"
 #include "commands.h"
 
-static void starv_sects(s_char *range);
-static void starv_ships(s_char *range);
-static void starv_units(s_char *range);
+static void starv_sects(char *range);
+static void starv_ships(char *range);
+static void starv_units(char *range);
 static void sect_hdr(void);
 static void ship_hdr(void);
 static void unit_hdr(void);
@@ -61,7 +61,7 @@ starve(void)
     int do_sects = 0;
     int do_ships = 0;
     int do_units = 0;
-    s_char range[1024];
+    char range[1024];
 
     if (opt_NOFOOD) {		/* no food - no work! */
 	pr("No food is required in this game\n");
@@ -98,7 +98,7 @@ starve(void)
 }
 
 static void
-starv_sects(s_char *range)
+starv_sects(char *range)
 {
     struct nstr_sect nstr;
     struct sctstr sect;
@@ -158,7 +158,7 @@ sect_hdr(void)
 }
 
 static void
-starv_ships(s_char *range)
+starv_ships(char *range)
 {
     struct nstr_item ni;
     struct shpstr ship;
@@ -206,7 +206,7 @@ ship_hdr(void)
 }
 
 static void
-starv_units(s_char *range)
+starv_units(char *range)
 {
     struct nstr_item ni;
     struct lndstr land;
diff --git a/src/lib/commands/surv.c b/src/lib/commands/surv.c
index 75098cfe..462ef0a3 100644
--- a/src/lib/commands/surv.c
+++ b/src/lib/commands/surv.c
@@ -61,15 +61,15 @@ surv(void)
     struct natstr *np;
     struct sctstr sect;
     struct range range;
-    s_char *ptr;
+    char *ptr;
     struct nscstr cond[NS_NCOND];
     int ncond;
     int i;
-    s_char buf[1024];
+    char buf[1024];
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
 
     nsect = 0;
     ptr = getstarg(player->argp[1], "commodity or variable? ", buf);
diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index d8499d75..0f86ac02 100644
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -54,8 +54,8 @@ swaps(void)
 {
     struct sctstr secta, sectb;
     coord x, y;
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
 
     if (!(p = getstarg(player->argp[1], "First sector : ", buf)) ||
 	!sarg_xy(p, &secta.sct_x, &secta.sct_y) ||
diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 54b1ff1e..5f80bf81 100644
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -51,7 +51,7 @@
 #include "commands.h"
 
 static void expose_ship(struct shpstr *s1, struct shpstr *s2);
-static int tend_land(struct shpstr *tenderp, s_char *units);
+static int tend_land(struct shpstr *tenderp, char *units);
 
 int
 tend(void)
@@ -71,9 +71,9 @@ tend(void)
     int transfer;
     int total;
     int type;
-    s_char *p;
-    s_char prompt[512];
-    s_char buf[1024];
+    char *p;
+    char prompt[512];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1],
 		       "Tend what commodity (or 'land')? ", buf)) || !*p)
@@ -205,7 +205,7 @@ expose_ship(struct shpstr *s1, struct shpstr *s2)
 }
 
 static int
-tend_land(struct shpstr *tenderp, s_char *units)
+tend_land(struct shpstr *tenderp, char *units)
 {
     struct nstr_item lni;
     struct nstr_item targets;
@@ -213,7 +213,7 @@ tend_land(struct shpstr *tenderp, s_char *units)
     struct lndstr land;
     struct plnstr plane;
     struct nstr_item pni;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&lni, EF_LAND, units))
 	return RET_SYN;
diff --git a/src/lib/commands/terr.c b/src/lib/commands/terr.c
index cd3fb95d..a72ed781 100644
--- a/src/lib/commands/terr.c
+++ b/src/lib/commands/terr.c
@@ -46,12 +46,12 @@ int
 terr(void)
 {
     struct sctstr sect;
-    s_char *p;
+    char *p;
     int terr_n;
     int field;
     struct nstr_sect nstr;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c
index dd79ecae..369798df 100644
--- a/src/lib/commands/thre.c
+++ b/src/lib/commands/thre.c
@@ -54,11 +54,11 @@ thre(void)
     struct nstr_sect nstr;
     int val;
     struct ichrstr *ip;
-    s_char *p;
+    char *p;
     int thresh;
     i_type type;
-    s_char prompt[128];
-    s_char buf[128];
+    char prompt[128];
+    char buf[128];
 
     if ((ip = whatitem(player->argp[1], "What commodity? ")) == 0)
 	return RET_SYN;
diff --git a/src/lib/commands/togg.c b/src/lib/commands/togg.c
index 5cdb1f07..531398e7 100644
--- a/src/lib/commands/togg.c
+++ b/src/lib/commands/togg.c
@@ -45,7 +45,7 @@ togg(void)
 {
     int flag = 0;
     int pos;
-    s_char *name;
+    char *name;
     struct natstr *np;
 
     np = getnatp(player->cnum);
diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index fb1a5289..3564e83e 100644
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -70,14 +70,14 @@ torp(void)
     double hitchance;
     struct shpstr vship;
     struct shpstr sub;
-    s_char *ptr;
+    char *ptr;
     double mobcost;
     struct mchrstr *mcp;
     struct nstr_item nbst;
-    s_char buf[1024];
-    s_char *sav;
+    char buf[1024];
+    char *sav;
     int ntorping = 0;
-    s_char prompt[128];
+    char prompt[128];
 
     if (!(sav = getstarg(player->argp[1], "From ship(s)? ", buf)))
 	return RET_SYN;
@@ -470,7 +470,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
     return 1;
 }
 
-s_char *
+char *
 prsub(struct shpstr *sp)
 {
     if (mchr[(int)sp->shp_type].m_flags & M_SUB)
diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 2e73b83e..b15235c6 100644
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -79,7 +79,7 @@ trad(void)
     double tleft;
     double tally;
     int q;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
 	pr("The market is disabled.\n");
diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index 2c9bc427..f88a9cc5 100644
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -58,8 +58,8 @@ static int supgr(void);
 int
 upgr(void)
 {
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
 	return RET_SYN;
diff --git a/src/lib/commands/wing.c b/src/lib/commands/wing.c
index 593335ac..84e03dda 100644
--- a/src/lib/commands/wing.c
+++ b/src/lib/commands/wing.c
@@ -47,10 +47,10 @@ wing(void)
 
     struct plnstr plane;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(cp = getstarg(player->argp[1], "wing? ", buf)))
 	return RET_SYN;
diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c
index d06f320f..d84bcb4b 100644
--- a/src/lib/commands/work.c
+++ b/src/lib/commands/work.c
@@ -54,9 +54,9 @@ work(void)
     struct sctstr sect;
     struct lndstr land;
     int work_amt, eff_amt, w;
-    s_char *p;
+    char *p;
     coord donex = 0, doney = 1;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtitem(&ni, EF_LAND, player->argp[1]))
 	return RET_SYN;
diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c
index d819b0d1..cf011564 100644
--- a/src/lib/commands/zdon.c
+++ b/src/lib/commands/zdon.c
@@ -66,7 +66,7 @@ zdon(void)
 {
     natid whichcnum;
     struct natstr *natp;
-    register s_char *p;
+    char *p;
 
     int update;
     int checking;
@@ -74,7 +74,7 @@ zdon(void)
     int totpop;
     int totwant;
     int dowant;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_DEMANDUPDATE) {
 	pr("Demand updates are not enabled.\n");
diff --git a/src/lib/common/mailbox.c b/src/lib/common/mailbox.c
index bb9a648e..44740fb5 100644
--- a/src/lib/common/mailbox.c
+++ b/src/lib/common/mailbox.c
@@ -38,8 +38,8 @@
 #include "optlist.h"
 #include <stdio.h>
 
-s_char *
-mailbox(s_char *buf, natid cn)
+char *
+mailbox(char *buf, natid cn)
 {
     (void)sprintf(buf, "%s%d", telfil, cn);
     return buf;
diff --git a/src/lib/common/maps.c b/src/lib/common/maps.c
index 90a21bd9..198b582c 100644
--- a/src/lib/common/maps.c
+++ b/src/lib/common/maps.c
@@ -51,7 +51,7 @@
 #include "optlist.h"
 
 static int bmnxtsct(struct nstr_sect *);
-static s_char map_char(unsigned char type, natid own, int owner_or_god);
+static char map_char(unsigned char type, natid own, int owner_or_god);
 
 int
 draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
@@ -67,8 +67,8 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
     static unsigned char *bitmap = NULL;
-    static s_char *wmapbuf = NULL;
-    static s_char **wmap = NULL;
+    static char *wmapbuf = NULL;
+    static char **wmap = NULL;
 
     if (!wmapbuf)
 	wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
@@ -153,7 +153,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
 	}
     } else {
 	struct sctstr sect;
-	s_char mapch;
+	char mapch;
 	int changed = 0;
 
 	if (!player->god) {
@@ -218,7 +218,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
 	}
     }
     if (map_flags & MAP_HIGH) {
-	s_char *ptr;
+	char *ptr;
 	struct sctstr sect;
 
 	snxtsct_rewind(nsp);
@@ -287,7 +287,7 @@ bmnxtsct(struct nstr_sect *np)
  * Return character to use in maps for sector type TYPE owned by OWN.
  * If OWNER_OR_GOD, the map is for the sector's owner or a deity.
  */
-static s_char
+static char
 map_char(unsigned char type, natid own, int owner_or_god)
 {
     if (type > SCT_MAXDEF) {
@@ -352,16 +352,16 @@ bmaps_intersect(natid a, natid b)
 /* Note that this requires that the BMAP is mapped into memory */
 
 int
-share_bmap(natid from, natid to, struct nstr_sect *ns, s_char des,
-	   s_char *from_name)
+share_bmap(natid from, natid to, struct nstr_sect *ns, char des,
+	   char *from_name)
 {
-    s_char *from_bmap = ef_ptr(EF_BMAP, from);
-    s_char *to_bmap = ef_ptr(EF_BMAP, to);
+    char *from_bmap = ef_ptr(EF_BMAP, from);
+    char *to_bmap = ef_ptr(EF_BMAP, to);
     int n = 0;
     struct sctstr sect;
-    s_char fromdes;
-    s_char todes;
-    s_char from_des = *from_name;
+    char fromdes;
+    char todes;
+    char from_des = *from_name;
 
     if (isalpha(from_des))
 	from_des &= ~0x20;
diff --git a/src/lib/common/path.c b/src/lib/common/path.c
index cad7dc5c..ce1ede17 100644
--- a/src/lib/common/path.c
+++ b/src/lib/common/path.c
@@ -59,7 +59,7 @@ struct bestp {
     struct as_data *adp;
 };
 
-static int bp_path(struct as_path *pp, s_char *buf);
+static int bp_path(struct as_path *pp, char *buf);
 static int bp_neighbors(struct as_coord c, struct as_coord *cp, void *);
 static double bp_lbcost(struct as_coord from, struct as_coord to, void *);
 static double bp_realcost(struct as_coord from, struct as_coord to, void *);
@@ -96,7 +96,7 @@ bp_init(void)
  * string in path.  Return 0 on success, -1 on error.
  */
 static int
-best_path(struct sctstr *from, struct sctstr *to, s_char *path,
+best_path(struct sctstr *from, struct sctstr *to, char *path,
 	  int mob_type)
 {
     static struct bestp *mybestpath;
@@ -138,10 +138,10 @@ best_path(struct sctstr *from, struct sctstr *to, s_char *path,
  * success, -1 on failure.
  */
 static int
-bp_path(struct as_path *pp, s_char *buf)
+bp_path(struct as_path *pp, char *buf)
 {
     struct as_path *np;
-    s_char *cp = buf;
+    char *cp = buf;
     int dx, dy;
     int n;
 
@@ -301,7 +301,7 @@ bp_clear_cachepath(void)
 }
 
 double
-pathcost(struct sctstr *start, s_char *path, int mob_type)
+pathcost(struct sctstr *start, char *path, int mob_type)
 {
     struct sctstr *sectp = (void *)empfile[EF_SECTOR].cache;
     unsigned i;
@@ -338,16 +338,16 @@ pathcost(struct sctstr *start, s_char *path, int mob_type)
     return cost;
 }
 
-s_char *
-BestDistPath(s_char *path,
+char *
+BestDistPath(char *path,
 	     struct sctstr *from,
 	     struct sctstr *to, double *cost, int mob_type)
 {
     return BestLandPath(path, from, to, cost, mob_type);
 }
 
-s_char *
-BestLandPath(s_char *path,
+char *
+BestLandPath(char *path,
 	     struct sctstr *from,
 	     struct sctstr *to, double *cost, int mob_type)
 {
@@ -364,8 +364,8 @@ BestLandPath(s_char *path,
     return path;
 }
 
-s_char *
-BestShipPath(s_char *path, int fx, int fy, int tx, int ty, int owner)
+char *
+BestShipPath(char *path, int fx, int fy, int tx, int ty, int owner)
 {
     char *map;
 
@@ -376,8 +376,8 @@ BestShipPath(s_char *path, int fx, int fy, int tx, int ty, int owner)
     return bestownedpath(path, map, fx, fy, tx, ty, owner);
 }
 
-s_char *
-BestAirPath(s_char *path, int fx, int fy, int tx, int ty)
+char *
+BestAirPath(char *path, int fx, int fy, int tx, int ty)
 {
     return bestownedpath(path, 0, fx, fy, tx, ty, -1);
 }
diff --git a/src/lib/gen/copy.c b/src/lib/gen/copy.c
index b76a6482..e2502e4a 100644
--- a/src/lib/gen/copy.c
+++ b/src/lib/gen/copy.c
@@ -44,11 +44,11 @@
  * null terminate
  */
 void
-blankfill(s_char *ptr, register struct range *range, int size)
+blankfill(char *ptr, struct range *range, int size)
 {
-    register s_char *p;
-    register int row;
-    register int col;
+    char *p;
+    int row;
+    int col;
 
     for (row = 0; row < range->height; row++) {
 	col = (range->width + 1) * (size + 1) / 2 - 1;
diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index e63912b9..01761bfc 100644
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -67,7 +67,7 @@ struct keymatch configkeys[] = {
 #undef	EMP_CONFIG_C_OUTPUT
 };
 
-static struct keymatch *keylookup(s_char *key, struct keymatch tbl[]);
+static struct keymatch *keylookup(char *key, struct keymatch tbl[]);
 static void set_dirs(char *);
 
 /*
@@ -159,9 +159,9 @@ done:
 
 /* find the key in the table */
 static struct keymatch *
-keylookup(register s_char *command, struct keymatch *tbl)
+keylookup(char *command, struct keymatch *tbl)
 {
-    register struct keymatch *kp;
+    struct keymatch *kp;
 
     if (command == 0 || *command == 0)
 	return 0;
diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c
index dc762a18..fabeb997 100644
--- a/src/lib/gen/io.c
+++ b/src/lib/gen/io.c
@@ -126,7 +126,7 @@ io_close(struct iop *iop)
 int
 io_input(struct iop *iop, int waitforinput)
 {
-    s_char buf[IO_BUFSIZE];
+    char buf[IO_BUFSIZE];
     int cc;
 
     /* Not a read IOP */
@@ -278,7 +278,7 @@ io_output(struct iop *iop, int waitforoutput)
 }
 
 int
-io_peek(struct iop *iop, s_char *buf, int nbytes)
+io_peek(struct iop *iop, char *buf, int nbytes)
 {
     if ((iop->flags & IO_READ) == 0)
 	return -1;
@@ -286,7 +286,7 @@ io_peek(struct iop *iop, s_char *buf, int nbytes)
 }
 
 int
-io_read(struct iop *iop, s_char *buf, int nbytes)
+io_read(struct iop *iop, char *buf, int nbytes)
 {
     int cc;
 
@@ -299,7 +299,7 @@ io_read(struct iop *iop, s_char *buf, int nbytes)
 }
 
 int
-io_write(struct iop *iop, s_char *buf, int nbytes, int doWait)
+io_write(struct iop *iop, char *buf, int nbytes, int doWait)
 {
     int len;
 
@@ -335,7 +335,7 @@ io_output_all(struct iop *iop)
 }
 
 int
-io_gets(struct iop *iop, s_char *buf, int nbytes)
+io_gets(struct iop *iop, char *buf, int nbytes)
 {
     if ((iop->flags & IO_READ) == 0)
 	return -1;
@@ -343,7 +343,7 @@ io_gets(struct iop *iop, s_char *buf, int nbytes)
 }
 
 int
-io_puts(struct iop *iop, s_char *buf)
+io_puts(struct iop *iop, char *buf)
 {
     if ((iop->flags & IO_WRITE) == 0)
 	return -1;
diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index 2ed77383..78d02393 100644
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -49,14 +49,14 @@
 #include "queue.h"
 #include "ioqueue.h"
 
-static int ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc,
+static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc,
 		     register int stopc);
 #if !defined(_WIN32)
 static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov,
 		    register int max);
 #endif
-static int ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc);
-static int appendcc(struct ioqueue *ioq, s_char *buf, int cc);
+static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);
+static int appendcc(struct ioqueue *ioq, char *buf, int cc);
 static int removecc(struct ioqueue *ioq, register int cc);
 
 #if defined(_WIN32)
@@ -123,7 +123,7 @@ ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc)
  * number of bytes actually found.
  */
 int
-ioq_peek(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_peek(struct ioqueue *ioq, char *buf, int cc)
 {
     return ioqtobuf(ioq, buf, cc);
 }
@@ -135,7 +135,7 @@ ioq_dequeue(struct ioqueue *ioq, int cc)
 }
 
 void
-ioq_append(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_append(struct ioqueue *ioq, char *buf, int cc)
 {
     appendcc(ioq, buf, cc);
 }
@@ -152,7 +152,7 @@ ioq_qsize(struct ioqueue *ioq)
  * no input is available
  */
 int
-ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_gets(struct ioqueue *ioq, char *buf, int cc)
 {
     int nbytes;
     int actual;
@@ -173,7 +173,7 @@ ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
 }
 
 int
-ioq_puts(struct ioqueue *ioq, s_char *buf)
+ioq_puts(struct ioqueue *ioq, char *buf)
 {
     return appendcc(ioq, buf, strlen(buf));
 }
@@ -189,14 +189,14 @@ ioq_puts(struct ioqueue *ioq, s_char *buf)
  * left for a higher level.
  */
 static int
-ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
+ioqtobuf(struct ioqueue *ioq, char *buf, int cc)
 {
     struct io *io;
     struct emp_qelem *qp;
     struct emp_qelem *head;
     register int nbytes;
     register int nleft;
-    register s_char *offset;
+    char *offset;
 
     nleft = cc;
     offset = buf;
@@ -223,7 +223,7 @@ ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
  * terminating on the stop character.
  */
 static int
-ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc, register int stopc)
+ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, register int stopc)
 {
     register int nbytes;
     register s_char *p;
@@ -294,7 +294,7 @@ ioqtoiov(struct ioqueue *ioq, struct iovec *iov, register int max)
  * append a buffer to the end of the ioq.
  */
 static int
-appendcc(struct ioqueue *ioq, s_char *buf, int cc)
+appendcc(struct ioqueue *ioq, char *buf, int cc)
 {
     struct io *io;
     int len;
diff --git a/src/lib/gen/numstr.c b/src/lib/gen/numstr.c
index 888311b6..97aea916 100644
--- a/src/lib/gen/numstr.c
+++ b/src/lib/gen/numstr.c
@@ -37,16 +37,16 @@
 #include "misc.h"
 #include "gen.h"
 
-s_char *
-numstr(s_char *buf, int n)
+char *
+numstr(char *buf, int n)
 {
-    static s_char *numnames[] = {
+    static char *numnames[] = {
 	"zero", "one", "two", "three", "four", "five", "six",
 	"seven", "eight", "nine", "ten", "eleven", "twelve",
 	"thirteen", "fourteen", "fifteen", "sixteen",
 	"seventeen", "eighteen", "nineteen",
     };
-    static s_char *tennames[] = {
+    static char *tennames[] = {
 	"", "", "twenty", "thirty", "forty", "fifty",
 	"sixty", "seventy", "eighty", "ninety",
 	"hundred", "hundred ten", "hundred twenty",
@@ -71,10 +71,10 @@ numstr(s_char *buf, int n)
     return buf;
 }
 
-s_char *
+char *
 effadv(int n)
 {
-    static s_char *effadv_list[] = {
+    static char *effadv_list[] = {
 	"minimally", "partially", "moderately", "completely",
     };
 
diff --git a/src/lib/gen/onearg.c b/src/lib/gen/onearg.c
index af1248f1..83ed4157 100644
--- a/src/lib/gen/onearg.c
+++ b/src/lib/gen/onearg.c
@@ -37,10 +37,10 @@
 #include "gen.h"
 
 int
-onearg(s_char *arg, s_char *prompt)
+onearg(char *arg, char *prompt)
 {
     int n;
-    s_char buf[1024];
+    char buf[1024];
 
     if (arg == 0 || *arg == 0) {
 	if ((arg = getstring(prompt, buf)) == 0)
diff --git a/src/lib/gen/plur.c b/src/lib/gen/plur.c
index 62833502..60854e8e 100644
--- a/src/lib/gen/plur.c
+++ b/src/lib/gen/plur.c
@@ -35,19 +35,19 @@
 
 #include "prototypes.h"
 
-s_char *
+char *
 splur(int n)
 {
     return n == 1 ? "" : "s";
 }
 
-s_char *
+char *
 esplur(int n)
 {
     return n == 1 ? "" : "es";
 }
 
-s_char *
+char *
 iesplur(int n)
 {
     return n == 1 ? "y" : "ies";
diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c
index 33205b48..83d445e3 100644
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -124,8 +124,8 @@ log_last_commands(void)
 int
 explain(void)
 {
-    register s_char *format;
-    register int i;
+    char *format;
+    int i;
 
     pr("\t\tCurrent EMPIRE Command List\n"
        "\t\t------- ------ ------- ----\n"
diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c
index 4fc33537..dd5aa5db 100644
--- a/src/lib/player/nat.c
+++ b/src/lib/player/nat.c
@@ -41,7 +41,7 @@
 #include <fcntl.h>
 
 int
-natbyname(s_char *name, natid *result)
+natbyname(char *name, natid *result)
 {
     struct natstr *np;
     int i;
@@ -57,7 +57,7 @@ natbyname(s_char *name, natid *result)
 }
 
 int
-natpass(int cn, s_char *pass)
+natpass(int cn, char *pass)
 {
     struct natstr *np;
 
diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index e8468c92..aeff1584 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -65,7 +65,7 @@ static void ac_dog(struct plist *ap, struct plist *dp);
 
 void
 ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
-	     coord x, coord y, s_char *path, int mission_flags,
+	     coord x, coord y, char *path, int mission_flags,
 	     int no_air_defense, struct emp_qelem *obomb,
 	     struct emp_qelem *oesc)
 {
@@ -78,7 +78,7 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
     int unfriendly[MAXNOC];
     int overfly[MAXNOC];
     struct emp_qelem ilist[MAXNOC], *qp;
-    s_char mypath[1024];
+    char mypath[1024];
     int myp;
     int civ, mil;
     natid plane_owner;
@@ -602,8 +602,8 @@ ac_dog(struct plist *ap, struct plist *dp)
     int intensity;
     natid att_own, def_own;
     int adam, ddam;
-    s_char mesg[1024];
-    s_char temp[14];
+    char mesg[1024];
+    char temp[14];
 
     att_own = ap->plane.pln_own;
     def_own = dp->plane.pln_own;
@@ -694,11 +694,11 @@ ac_dog(struct plist *ap, struct plist *dp)
  */
 void
 ac_planedamage(struct plist *plp, natid from, int dam, natid other,
-	       int checkabort, int show, s_char *mesg)
+	       int checkabort, int show, char *mesg)
 {
     struct plnstr *pp;
     int disp;
-    s_char dmess[255];
+    char dmess[255];
     int eff;
     struct shpstr ship;
     struct lndstr land;
@@ -953,7 +953,7 @@ ac_fireflak(struct emp_qelem *list, natid from, natid other, int guns)
     int diff;
     struct emp_qelem *qp;
     struct emp_qelem *next;
-    s_char msg[255];
+    char msg[255];
 
     plp = (struct plist *)list->q_forw;
 
diff --git a/src/lib/subs/askyn.c b/src/lib/subs/askyn.c
index 51108b0c..ae5dff73 100644
--- a/src/lib/subs/askyn.c
+++ b/src/lib/subs/askyn.c
@@ -42,9 +42,9 @@
  * If they don't answer 'y' or 'Y', return 0
  */
 int
-confirm(s_char *promptstring)
+confirm(char *promptstring)
 {
-    s_char y_or_n[1024];
+    char y_or_n[1024];
     char c;
 
     if (getstring(promptstring, y_or_n) == 0)
@@ -60,9 +60,9 @@ confirm(s_char *promptstring)
  * return 1 for y or Y, and 0 for n or N
  */
 int
-askyn(s_char *promptstring)
+askyn(char *promptstring)
 {
-    s_char y_or_n[1024];
+    char y_or_n[1024];
     char c;
 
     while (getstring(promptstring, y_or_n)) {
diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 7629c720..29f39059 100644
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -127,7 +127,7 @@ att_combat_init(struct combat *com, int type)
 
 /* print a combat object with optional preposition */
 
-static s_char *
+static char *
 pr_com(int inon, struct combat *com, natid who)
 {
     if (com->type == EF_SECTOR) {
@@ -148,7 +148,7 @@ pr_com(int inon, struct combat *com, natid who)
     }
 }
 
-static s_char *
+static char *
 prcom(int inon, struct combat *com)
 {
     return pr_com(inon, com, player->cnum);
@@ -452,7 +452,7 @@ att_abort(int combat_mode, struct combat *off, struct combat *def)
 {
     struct sctstr sect;
     int rel;
-    s_char y_or_n[512];
+    char y_or_n[512];
     struct natstr *natp;
 
     if (player->aborted)
@@ -708,8 +708,8 @@ int
 att_ask_support(int offset, int *fortp, int *shipp, int *landp,
 		int *planep)
 {
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
     *fortp = *shipp = *landp = *planep = 1;
 
     if (player->argp[offset] != NULL) {
@@ -880,7 +880,7 @@ ask_off(int combat_mode, struct combat *off, struct combat *def)
 {
     int attacking_mil;
     int mob_support;
-    s_char prompt[512];
+    char prompt[512];
 
     if (att_get_combat(off, 0) <= 0)
 	return 0;
@@ -959,7 +959,7 @@ ask_olist(int combat_mode, struct combat *off, struct combat *def,
     int count = 0;
     int maxland = 0;
     int first_time = 1;
-    s_char prompt[512];
+    char prompt[512];
 
     if (def->type == EF_LAND)
 	return;
@@ -1342,7 +1342,7 @@ get_land(int combat_mode, struct combat *def, int uid, struct llist *llp,
 	 int victim_land)
 {
     struct lndstr *lp = &llp->land;
-    s_char buf[512];
+    char buf[512];
 
     getland(uid, lp);
 
@@ -1473,8 +1473,8 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
     int radius;
     int origx, origy;
     double eff = att_combat_eff(def);
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     /*
      *
@@ -1580,7 +1580,7 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
 /* Pop off shells and fly bombing missions to get your attack multiplier up */
 
 static double
-get_osupport(s_char *outs, struct combat *def, int fort_sup, int ship_sup,
+get_osupport(char *outs, struct combat *def, int fort_sup, int ship_sup,
 	     int land_sup, int plane_sup)
 {
     double osupport = 1.0;
@@ -1619,7 +1619,7 @@ get_osupport(s_char *outs, struct combat *def, int fort_sup, int ship_sup,
 /* Pop off shells and fly bombing missions to get your defense multiplier up */
 
 static double
-get_dsupport(s_char *outs, struct emp_qelem *list, struct combat *def,
+get_dsupport(char *outs, struct emp_qelem *list, struct combat *def,
 	     int ototal, int dtotal)
 {
     double dsupport = 1.0;
@@ -1708,8 +1708,8 @@ att_get_support(int combat_mode, int ofort, int oship, int oland,
 		double *osupportp, double *dsupportp, int a_engineer)
 {
     int ototal, dtotal;
-    s_char osupports[512];
-    s_char dsupports[512];
+    char osupports[512];
+    char dsupports[512];
 
     if (combat_mode == A_PARA)
 	*osupports = '\0';
@@ -1801,7 +1801,7 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
     int news_item;
     int recalctime;
     double odds;
-    s_char *action;
+    char *action;
 
     ototal = get_ototal(combat_mode, off, olist, osupport,
 			combat_mode != A_PARA);
@@ -2154,7 +2154,7 @@ send_reacting_units_home(struct emp_qelem *list)
 {
     struct emp_qelem *qp, *next;
     struct llist *llp;
-    s_char buf[1024];
+    char buf[1024];
 
     for (qp = list->q_forw; qp != list; qp = next) {
 	next = qp->q_forw;
@@ -2199,7 +2199,7 @@ take_def(int combat_mode, struct emp_qelem *list, struct combat *off,
     int n;
     int occuppied = 0;
     struct llist *llp, *delete_me = 0;
-    s_char buf[1024];
+    char buf[1024];
     struct sctstr sect;
     struct shpstr ship;
     struct lndstr land;
@@ -2281,8 +2281,8 @@ ask_move_in(struct combat *off, struct emp_qelem *olist,
     int n;
     struct emp_qelem *qp, *next;
     struct llist *llp;
-    s_char buf[512];
-    s_char prompt[512];
+    char buf[512];
+    char prompt[512];
     s_char land_answer[1024];
     s_char *answerp;
 
@@ -2351,7 +2351,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist,
 {
     struct emp_qelem *qp, *next;
     struct llist *llp;
-    s_char buf[512];
+    char buf[512];
 
     if (QEMPTY(olist))
 	return;
@@ -2450,9 +2450,9 @@ ask_move_in_off(struct combat *off, struct combat *def)
     int mob_support;
     int num_mil, dam = 0, left;
     double d, weight;
-    s_char prompt[512];
-    s_char buf[1024];
-    s_char *p;
+    char prompt[512];
+    char buf[1024];
+    char *p;
 
     if (att_get_combat(off, 0) <= 0)
 	return;
diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c
index 7f069640..daba5dec 100644
--- a/src/lib/subs/border.c
+++ b/src/lib/subs/border.c
@@ -39,7 +39,7 @@
 #include "optlist.h"
 
 void
-border(struct range *rp, s_char *prefstr, s_char *sep)
+border(struct range *rp, char *prefstr, char *sep)
 
 				/* prefixes each line */
 				/* separates the numbers */
diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c
index 1b43598b..69259e19 100644
--- a/src/lib/subs/caploss.c
+++ b/src/lib/subs/caploss.c
@@ -42,7 +42,7 @@
 #include "optlist.h"
 
 void
-caploss(struct sctstr *sp, natid coun, s_char *msg)
+caploss(struct sctstr *sp, natid coun, char *msg)
 {
     struct natstr *natp;
     struct lonstr loan;
diff --git a/src/lib/subs/chkmoney.c b/src/lib/subs/chkmoney.c
index 5c9cf5f3..bd2d23a6 100644
--- a/src/lib/subs/chkmoney.c
+++ b/src/lib/subs/chkmoney.c
@@ -38,10 +38,10 @@
 #include "prototypes.h"
 
 int
-chkmoney(long int cost, long int cash, s_char *argp)
+chkmoney(long int cost, long int cash, char *argp)
 {
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
 
     if (cash > 0 && cost > cash / 2) {
 	pr("This operation will cost you $%ld, and you only have $%ld.\n",
@@ -58,10 +58,10 @@ chkmoney(long int cost, long int cash, s_char *argp)
 
 int
 check_cost(int looping, int cost, long int cash, int *warnedp,
-	   s_char *argp)
+	   char *argp)
 {
-    s_char buf[1024];
-    s_char *p;
+    char buf[1024];
+    char *p;
 
     if (looping && cash > 0 && player->dolcost + cost > cash
 	&& *warnedp < 2) {
diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c
index 6e7948bc..9d7d2eb5 100644
--- a/src/lib/subs/detonate.c
+++ b/src/lib/subs/detonate.c
@@ -62,9 +62,9 @@ detonate(struct plnstr *pp, int x, int y)
     struct shpstr ship;
     struct lndstr land;
     struct nukstr nuke;
-    s_char *bp;
-    s_char buf[128];
-    s_char buf2[128];
+    char *bp;
+    char buf[128];
+    char buf2[128];
     natid own;
     int type;
     int damage;
diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c
index 2a534c0d..078a8d82 100644
--- a/src/lib/subs/land.c
+++ b/src/lib/subs/land.c
@@ -171,7 +171,7 @@ lnd_init(int n, void *ptr)
     lp->lnd_own = 0;
 }
 
-s_char *
+char *
 prland(struct lndstr *lp)
 {
     return prbuf("%s #%d", lchr[(int)lp->lnd_type].l_name, lp->lnd_uid);
diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index caecf964..25853a36 100644
--- a/src/lib/subs/list.c
+++ b/src/lib/subs/list.c
@@ -286,7 +286,7 @@ num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
  */
 
 int
-islist(s_char *p)
+islist(char *p)
 {
     int x;
 
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 979ca9a0..12d8c07b 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -150,7 +150,7 @@ total_mil(struct lndstr *lp)
 }
 
 void
-lnd_print(struct llist *llp, s_char *s)
+lnd_print(struct llist *llp, char *s)
 {
     if (llp->land.lnd_own == player->cnum)
 	pr("%s %s\n", prland(&llp->land), s);
@@ -159,7 +159,7 @@ lnd_print(struct llist *llp, s_char *s)
 }
 
 void
-lnd_delete(struct llist *llp, s_char *s)
+lnd_delete(struct llist *llp, char *s)
 {
     if (s)
 	lnd_print(llp, s);
@@ -182,7 +182,7 @@ lnd_take_casualty(int combat_mode, struct llist *llp, int cas)
     coord bx, by;
     struct sctstr sect;
     int ret_chance;
-    s_char buf[1024];
+    char buf[1024];
     int taken;
     int nowhere_to_go = 0;
     struct sctstr rsect;
@@ -353,10 +353,10 @@ lnd_spyval(struct lndstr *lp)
 
 int
 intelligence_report(int destination, struct lndstr *lp, int spy,
-		    s_char *mess)
+		    char *mess)
 {
     struct lchrstr *lcp;
-    s_char buf1[80], buf2[80], buf3[80];
+    char buf1[80], buf2[80], buf3[80];
     double estimate = 0.0;	/* estimated defense value */
 
     if (destination == 0)
@@ -566,7 +566,7 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
     coord allx;
     coord ally;
     int first = 1;
-    s_char mess[128];
+    char mess[128];
     int rel;
 
     *minmobp = 9876.0;
@@ -805,7 +805,7 @@ lnd_list(struct emp_qelem *land_list)
 }
 
 void
-lnd_mess(s_char *str, struct llist *llp)
+lnd_mess(char *str, struct llist *llp)
 {
     mpr(llp->land.lnd_own, "%s %s & stays in %s\n",
 	prland(&llp->land),
@@ -1082,7 +1082,7 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
     int stopping = 0;
     int visible;
     int stop;
-    s_char dp[80];
+    char dp[80];
     int rel;
     int oldown;
 
@@ -1314,13 +1314,13 @@ lnd_support(natid victim, natid attacker, coord x, coord y, int defending)
     return (int)dam;
 }
 
-s_char *
-lnd_path(int together, struct lndstr *lp, s_char *buf)
+char *
+lnd_path(int together, struct lndstr *lp, char *buf)
 {
     coord destx;
     coord desty;
     struct sctstr d_sect, sect;
-    s_char *cp;
+    char *cp;
     double dummy;
 
     if (!sarg_xy(buf, &destx, &desty))
diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 51835d41..4555f257 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -76,7 +76,7 @@ union item_u {
 
 static void add_airport(struct emp_qelem *, coord, coord);
 static int air_damage(struct emp_qelem *, coord, coord, int, natid,
-		      s_char *, int);
+		      char *, int);
 static void build_mission_list(struct genlist *, coord, coord, int, natid);
 static void build_mission_list_type(struct genlist *, coord, coord, int,
 				    int, natid);
@@ -87,13 +87,13 @@ static int mission_pln_arm(struct emp_qelem *, coord, coord, int,
 			   int, struct ichrstr *, int, int, int *);
 static void mission_pln_sel(struct emp_qelem *, int, int, int);
 static int perform_mission(coord, coord, natid, struct emp_qelem *, int,
-			   s_char *, int);
+			   char *, int);
 
 /*
  * Interdict commodities & transported planes
  */
 int
-ground_interdict(coord x, coord y, natid victim, s_char *s)
+ground_interdict(coord x, coord y, natid victim, char *s)
 {
     int cn;
     int dam = 0, newdam, rel;
@@ -177,7 +177,7 @@ only_subs(struct emp_qelem *list)
  *
  */
 int
-unit_interdict(coord x, coord y, natid victim, s_char *s, int hardtarget,
+unit_interdict(coord x, coord y, natid victim, char *s, int hardtarget,
 	       int mission)
 {
     int cn;
@@ -423,7 +423,7 @@ find_escorts(coord x, coord y, natid cn, struct emp_qelem *escorts)
 
 static int
 perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
-		int mission, s_char *s, int hardtarget)
+		int mission, char *s, int hardtarget)
 {
     struct emp_qelem *qp, missiles, bombers, escorts, airp, b, e;
     struct emp_qelem *newqp;
@@ -832,7 +832,7 @@ cando(int mission, int type)
     return 0;
 }
 
-s_char *
+char *
 nameofitem(struct genitem *gp, int type)
 {
     switch (type) {
@@ -846,7 +846,7 @@ nameofitem(struct genitem *gp, int type)
     return NULL;
 }
 
-s_char *
+char *
 mission_name(short int mission)
 {
     switch (mission) {
@@ -1378,7 +1378,7 @@ divide(struct emp_qelem *l1, struct emp_qelem *l2, coord x, coord y)
 
 static int
 air_damage(struct emp_qelem *bombers, coord x, coord y, int mission,
-	   natid victim, s_char *s, int hardtarget)
+	   natid victim, char *s, int hardtarget)
 {
     struct emp_qelem *qp;
     struct plist *plp;
diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index dfe8a48e..471f6498 100644
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -64,7 +64,7 @@ msl_equip(struct plnstr *pp)
 
 int
 msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
-	int snews_item, s_char *what, coord x, coord y, int victim)
+	int snews_item, char *what, coord x, coord y, int victim)
 {
     int hit;
     struct shpstr ship;
@@ -72,7 +72,7 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
     int sublaunch = 0;
     struct plchrstr *pcp = plchr + pp->pln_type;
     int hitchance = pln_hitchance(pp, hardtarget, type);
-    s_char *from;
+    char *from;
     int dam, dummyi;
 
     mpr(pp->pln_own, "Preparing to launch %s at %s %s %s%s\n",
@@ -155,7 +155,7 @@ msl_hit(struct plnstr *pp, int hardtarget, int type, int news_item,
     mpr(pp->pln_own, hit ? "HIT!\n" : "miss\n");
     if (pcp->pl_flags & P_T)
 	mpr(victim, "...Incoming %s missile %s\n",
-	    sublaunch ? (s_char *)"" : cname(pp->pln_own),
+	    sublaunch ? "" : cname(pp->pln_own),
 	    hit ? "HIT!\n" : "missed\n");
     if (hit && news_item) {
 	if (sublaunch)
@@ -225,10 +225,10 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
     struct plist *ip;
     int icount = 0;
     short destroyed = 0;
-    s_char *att_name;
-    s_char *def_name;
+    char *att_name;
+    char *def_name;
     int news_item;
-    s_char *who = sublaunch ? (s_char *)"" : cname(bombown);
+    char *who = sublaunch ? "" : cname(bombown);
 
     getsect(x, y, &sect);
     if (wantflags == P_O && !nowantflags) {
@@ -372,7 +372,7 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
 /* Keep launching missiles on list until mindam damage has been done */
 int
 msl_launch_mindam(struct emp_qelem *list, coord x, coord y, int hardtarget,
-		  int type, int mindam, s_char *whatp, int victim,
+		  int type, int mindam, char *whatp, int victim,
 		  int mission)
 {
     struct emp_qelem *qp;
diff --git a/src/lib/subs/mtch.c b/src/lib/subs/mtch.c
index fae127ac..9334ce0d 100644
--- a/src/lib/subs/mtch.c
+++ b/src/lib/subs/mtch.c
@@ -46,7 +46,7 @@
  * Ignore commands that require more permissions than COMSTAT.
  */
 int
-comtch(register s_char *command, struct cmndstr *coms, int comstat)
+comtch(char *command, struct cmndstr *coms, int comstat)
 {
     register struct cmndstr *com;
     register int status;
diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c
index b45ddaf3..85d95778 100644
--- a/src/lib/subs/plane.c
+++ b/src/lib/subs/plane.c
@@ -139,7 +139,7 @@ pln_init(int n, void *ptr)
     pp->pln_own = 0;
 }
 
-s_char *
+char *
 prplane(struct plnstr *pp)
 {
     return prbuf("%s #%d", plchr[(int)pp->pln_type].pl_name, pp->pln_uid);
diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c
index 0b78b3cb..9a1cbbb6 100644
--- a/src/lib/subs/radmap.c
+++ b/src/lib/subs/radmap.c
@@ -68,8 +68,8 @@ radmapupd(int own, int cx, int cy, int eff, int range, double seesub)
 /* More dynamic world sized buffers.  We create 'em once, and then
  * never again.  No need to keep creating/tearing apart.  We may
  * want to do this in other places too where it doesn't matter. */
-static s_char **rad;
-static s_char *radbuf;
+static char **rad;
+static char *radbuf;
 static s_char **vis;
 static s_char *visbuf;
 
diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index f2702972..4d1ae3d8 100644
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -47,13 +47,13 @@ setrel(natid us, natid them, int rel)
 {
     struct natstr *mynp;
     struct natstr *themnp;
-    s_char *myname = cname(us);
-    s_char *themname;
+    char *myname = cname(us);
+    char *themname;
     int oldrel;
-    s_char *whichway;
+    char *whichway;
     int n_up = 0;
     int n_down = 0;
-    s_char *addendum = 0;
+    char *addendum = 0;
     int theirrel;
 
     if (rel < AT_WAR)
diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index e39cb528..6aa6af99 100644
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -46,8 +46,8 @@
 #include "prototypes.h"
 #include "optlist.h"
 
-static s_char **rad;
-static s_char *radbuf;
+static char **rad;
+static char *radbuf;
 
 void
 satmap(int x, int y, int eff, int range, int flags, int type)
@@ -65,7 +65,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
     int changed = 0;
     long crackle;
     s_char noise[100];
-    s_char selection[1024];
+    char selection[1024];
 
     if (!eff)
 	return;
diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index fa9a98bd..4ad8390f 100644
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.c
@@ -138,9 +138,9 @@ checksect(struct sctstr *sp)
 }
 
 int
-issector(s_char *arg)
+issector(char *arg)
 {
-    s_char c;
+    char c;
 
     while (0 != (c = *arg++))
 	if (!isdigit(c) && !isspace(c) && (c != '/'))
diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 7c4a4562..4bbe3f39 100644
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -124,7 +124,7 @@ shp_init(int n, void *ptr)
     sp->shp_own = 0;
 }
 
-s_char *
+char *
 prship(struct shpstr *sp)
 {
     return prbuf("%s %s(#%d)",
diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 10fa5658..710e482d 100644
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -57,7 +57,7 @@
 
 static int shp_check_one_mines(struct mlist *);
 static int shp_hit_mine(struct shpstr *, struct mchrstr *);
-static void shp_mess(s_char *, struct mlist *);
+static void shp_mess(char *, struct mlist *);
 
 void
 shp_sel(struct nstr_item *ni, struct emp_qelem *list)
@@ -354,7 +354,7 @@ shp_list(struct emp_qelem *ship_list)
 }
 
 static void
-shp_mess(s_char *str, struct mlist *mlp)
+shp_mess(char *str, struct mlist *mlp)
 {
     mpr(mlp->ship.shp_own, "%s %s & stays in %s\n",
 	prship(&mlp->ship),
@@ -551,7 +551,7 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
     int stopping = 0;
     struct emp_qelem msl_list, *qp, *newqp;
     struct mlist *mvs;
-    s_char what[512];
+    char what[512];
 
     msl_sel(&msl_list, newx, newy, victim, P_T | P_MAR, 0, MI_INTERDICT);
 
@@ -824,7 +824,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
     double mobcost;
     double tech;		/* for mapping */
     double tf;			/* for mapping */
-    s_char dp[80];
+    char dp[80];
     int navigate;
 
     if (dir <= DIR_STOP || dir >= DIR_VIEW) {
@@ -999,13 +999,13 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget)
     return 0;			/* all attempts failed */
 }
 
-s_char *
-shp_path(int together, struct shpstr *shp, s_char *buf)
+char *
+shp_path(int together, struct shpstr *shp, char *buf)
 {
     coord destx;
     coord desty;
     struct sctstr d_sect;
-    s_char *cp;
+    char *cp;
 
     if (!sarg_xy(buf, &destx, &desty))
 	return 0;
@@ -1036,7 +1036,7 @@ shp_missdef(struct shpstr *sp, natid victim)
     struct emp_qelem list;
     struct mlist *mlp;
     int eff;
-    s_char buf[512];
+    char buf[512];
 
     emp_initque(&list);
 
diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index 86915d95..c1285d45 100644
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -165,7 +165,7 @@ s_commod(int own, int x, int y, i_type type, int total_wanted,
     int packing;
     struct dchrstr *dp;
     struct ichrstr *ip;
-    s_char buf[1024];
+    char buf[1024];
 
     /* try to get it from sector we're in */
     getsect(x, y, &dest);
diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index 0e3718d3..55aede7c 100644
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -74,7 +74,7 @@ trade_check_item_ok(union trdgenstr *tgp)
     return 0;
 }
 
-s_char *
+char *
 trade_nameof(struct trdstr *tp, union trdgenstr *tgp)
 {
     switch (tp->trd_type) {
diff --git a/src/lib/subs/trechk.c b/src/lib/subs/trechk.c
index 124e5e58..4a4ab70d 100644
--- a/src/lib/subs/trechk.c
+++ b/src/lib/subs/trechk.c
@@ -55,7 +55,7 @@ int
 trechk(register natid actor, register natid victim, int provision)
 {
     register natid cn;
-    s_char buf[1024];
+    char buf[1024];
     int news_verb;
     int involved[MAXNOC];
     struct trtstr treaty;
diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index 2bec6e5b..c821fc1d 100644
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -57,7 +57,7 @@
 #endif
 
 int
-dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
+dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
 	     double dist_e_cost)
 	  /* import or export? */
 {
diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index 4c512ef1..672295d4 100644
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -48,7 +48,7 @@
 
 /* Used for building up distribution info */
 struct distinfo {
-    s_char *path;		/* path to take */
+    char *path;			/* path to take */
     double imcost;		/* import cost */
     double excost;		/* export cost */
 };
@@ -66,11 +66,11 @@ static struct distinfo *g_distptrs;
 /* #define SAVE_FINISH_PATHS */
 
 #ifndef SAVE_FINISH_PATHS
-static s_char *finish_path = "h";	/* Placeholder indicating path exists */
+static char *finish_path = "h";	/* Placeholder indicating path exists */
 #endif /* SAVE_FINISH_PATHS */
 
 static void assemble_dist_paths(struct distinfo *distptrs);
-static s_char *ReversePath(s_char *path);
+static char *ReversePath(char *path);
 
 void
 finish_sects(int etu)
@@ -176,13 +176,13 @@ finish_sects(int etu)
 static void
 assemble_dist_paths(struct distinfo *distptrs)
 {
-    s_char *path, *p;
+    char *path, *p;
     double d;
     struct sctstr *sp;
     struct sctstr *dist;
     struct distinfo *infptr;
     int n;
-    s_char buf[512];
+    char buf[512];
 
     for (n = 0; NULL != (sp = getsectid(n)); n++) {
 	if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
@@ -229,11 +229,11 @@ assemble_dist_paths(struct distinfo *distptrs)
     }
 }
 
-static s_char *
-ReversePath(s_char *path)
+static char *
+ReversePath(char *path)
 {
-    s_char *patharray = "aucdefjhigklmyopqrstbvwxnz";
-    static s_char new_path[512];
+    char *patharray = "aucdefjhigklmyopqrstbvwxnz";
+    static char new_path[512];
     int ind;
 
     if (path == NULL)
diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index 0c4ec54c..64e50e61 100644
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -98,7 +98,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
     int len = 0;
     int follow = -1;
     int stop;
-    s_char *cp;
+    char *cp;
 
     if (sp->shp_own == 0)
 	return 0;
@@ -211,7 +211,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
     struct shpstr *sp, ship;
     struct sctstr *sectp;
     int error = 0;
-    s_char *s, *p;
+    char *s, *p;
     natid own;
     struct emp_qelem ship_list;
     int dir;
diff --git a/src/server/shutdown.c b/src/server/shutdown.c
index 2538bc23..081dc281 100644
--- a/src/server/shutdown.c
+++ b/src/server/shutdown.c
@@ -57,7 +57,7 @@ shutdown_sequence(void *unused)
     struct natstr *god;
     struct tm *tm;
     time_t now;
-    s_char header[100];
+    char header[100];
 
     if (shutdown_pending <= 0) {
 	shutdown_pending = 0;