diff --git a/include/budg.h b/include/budg.h
index eb7f2f69..1a5a6630 100644
--- a/include/budg.h
+++ b/include/budg.h
@@ -35,7 +35,6 @@
 #define BUDG_H
 
 void fill_update_array(int *bp, struct sctstr *sp);
-int *get_wp(int *bp, struct sctstr *sp, int cm);
 int gt_bg_nmbr(int *bp, struct sctstr *sp, i_type comm);
 void pt_bg_nmbr(int *bp, struct sctstr *sp, i_type comm, int amount);
 void get_materials(struct sctstr *sp, int *bp, int *mvec, int check);
diff --git a/include/combat.h b/include/combat.h
index 8f764594..594505f8 100644
--- a/include/combat.h
+++ b/include/combat.h
@@ -69,7 +69,6 @@ struct combat {
 #define A_LBOARD        5
 
 /* src/lib/subs/attsub.c */
-extern double att_calcodds(int, int);
 extern double att_combat_eff(struct combat *);
 extern void att_move_in_off(int, struct combat *, struct emp_qelem *,
 			    struct combat *);
diff --git a/include/land.h b/include/land.h
index efd492fd..82fa51d9 100644
--- a/include/land.h
+++ b/include/land.h
@@ -218,7 +218,6 @@ extern void count_units(struct shpstr *);
 extern void lnd_count_units(struct lndstr *);
 extern void lnd_mar(struct emp_qelem *, double *, double *, int *, natid);
 extern void lnd_put(struct emp_qelem *, natid);
-extern int lnd_hit_mine(struct lndstr *, struct lchrstr *);
 extern void lnd_list(struct emp_qelem *);
 extern int lnd_hardtarget(struct lndstr *);
 extern int lnd_mar_one_sector(struct emp_qelem *, int, natid, int);
diff --git a/include/misc.h b/include/misc.h
index 626d46ea..61c2518b 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -98,7 +98,6 @@ typedef short coord;
 #define days(x)		(60*60*24*(x))
 
 extern int debug;
-extern int daemonize;
 
 /*
  * If EXPR is true, an internal error occured.
diff --git a/include/plane.h b/include/plane.h
index d4c25a22..8f03dd74 100644
--- a/include/plane.h
+++ b/include/plane.h
@@ -158,26 +158,15 @@ struct shiplist {
 #define PLN_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))
 
 /* src/lib/subs/aircombat.c */
-extern void ac_planedamage(struct plist *, natid, int, natid, int,
-			   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);
 extern void ac_airtoair(struct emp_qelem *, struct emp_qelem *);
-extern void ac_doflak(struct emp_qelem *, struct sctstr *);
-extern void ac_shipflak(struct emp_qelem *, coord, coord);
-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, 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 *);
 extern void sam_intercept(struct emp_qelem *, struct emp_qelem *,
 			  natid, natid, coord, coord, int);
-extern int all_missiles(struct emp_qelem *);
-extern int can_fly(int);
 
 /* src/lib/subs/aswplnsubs.c */
 extern int on_shiplist(short, struct shiplist *);
diff --git a/include/prototypes.h b/include/prototypes.h
index e18b9ae2..6c181cf1 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -420,7 +420,6 @@ extern int natpass(int, char *);
 extern struct player *player;	/* current player's context */
 extern char *praddr(struct player *);
 extern void player_main(struct player *);
-extern int command(void);
 /* more under Commands */
 /* recvclient.c */
 extern int recvclient(char *, int);
@@ -464,7 +463,6 @@ extern int shipdef(natid, natid, coord, coord);
 /* getbit.c */
 extern int emp_getbit(int, int, unsigned char *);
 extern void emp_setbit(int, int, unsigned char *);
-extern void emp_setbitmap(int, int, unsigned char *, int *);
 extern void bitinit2(struct nstr_sect *, unsigned char *, int);
 /* getele.c */
 extern int getele(char *, char *);
diff --git a/src/client/misc.h b/src/client/misc.h
index 295b3d91..c6f0f0b4 100644
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -50,7 +50,6 @@ struct ioqueue;
 extern char empirehost[];
 extern char empireport[];
 extern int eight_bit_clean;
-extern char num_teles[];
 extern int sock;
 extern char *SO;
 extern char *SE;
@@ -76,7 +75,6 @@ int tcp_connect(char *, char *);
 int login(int s, char *uname, char *cname, char *cpass, int kill_proc, int);
 void saveargv(int ac, char **src, char **dst);
 void sendcmd(int s, char *cmd, char *arg);
-int sendeof(int sock);
 void servercmd(struct ioqueue *ioq, FILE *auxfi);
 int serverio(int s, struct ioqueue *ioq);
 int termio(int fd, int sock, FILE *auxfi);
diff --git a/src/client/servcmd.c b/src/client/servcmd.c
index 7b071c99..ce14976e 100644
--- a/src/client/servcmd.c
+++ b/src/client/servcmd.c
@@ -52,14 +52,14 @@
 #include <io.h>
 #endif
 
-char num_teles[64];
+static char num_teles[64];
 static char the_prompt[1024];
 static int mode;
 static int nbtu;
 static int nmin;
-FILE *redir_fp;
-FILE *pipe_fp;
-int exec_fd;
+static FILE *redir_fp;
+static FILE *pipe_fp;
+static int exec_fd;
 
 static void prompt(FILE *auxfi);
 static void doredir(char *p);
diff --git a/src/client/termio.c b/src/client/termio.c
index a75b080d..12c3190b 100644
--- a/src/client/termio.c
+++ b/src/client/termio.c
@@ -45,6 +45,8 @@
 #include "misc.h"
 #include "tags.h"
 
+static int sendeof(int sock);
+
 int
 termio(int fd, int sock, FILE *auxfi)
 {
@@ -243,7 +245,7 @@ termio(int fd, int sock, FILE *auxfi)
     return 1;
 }
 
-int
+static int
 sendeof(int sock)
 {
 #ifndef _WIN32
diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c
index 041fdd4a..e20e3a43 100644
--- a/src/lib/commands/improve.c
+++ b/src/lib/commands/improve.c
@@ -45,7 +45,7 @@
 #include "optlist.h"
 #include "commands.h"
 
-char *prompt[] = {
+static char *prompt[] = {
     "Improve what ('road' or 'rail')? ",
     "Improve what ('road', 'rail' or 'defense')? "
 };
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 032f35b6..b05cb419 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -59,6 +59,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
+static int command(void);
 static int status(void);
 
 struct player *player;
@@ -139,7 +140,7 @@ player_main(struct player *p)
     pr("Bye-bye\n");
 }
 
-int
+static int
 command(void)
 {
     unsigned i;
diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 7d062b8a..d43136b4 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -53,10 +53,21 @@
 #include "optlist.h"
 #include "server.h"
 
-static void getilist(struct emp_qelem *list, natid own,
-		     struct emp_qelem *a, struct emp_qelem *b,
-		     struct emp_qelem *c, struct emp_qelem *d);
-static void ac_dog(struct plist *ap, struct plist *dp);
+static void ac_intercept(struct emp_qelem *, struct emp_qelem *,
+			 struct emp_qelem *, natid, coord, coord);
+static int all_missiles(struct emp_qelem *);
+static void ac_dog(struct plist *, struct plist *);
+static void ac_planedamage(struct plist *, natid, int, natid, int,
+			   int, char *);
+static void ac_doflak(struct emp_qelem *, struct sctstr *);
+static void ac_landflak(struct emp_qelem *, coord, coord);
+static void ac_shipflak(struct emp_qelem *, coord, coord);
+static void ac_fireflak(struct emp_qelem *, natid, natid, int);
+static void getilist(struct emp_qelem *, natid,
+		     struct emp_qelem *, struct emp_qelem *,
+		     struct emp_qelem *, struct emp_qelem *);
+static int can_fly(int);
+static int do_evade(struct emp_qelem *, struct emp_qelem *);
 
 void
 ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
@@ -431,7 +442,7 @@ sam_intercept(struct emp_qelem *att_list, struct emp_qelem *def_list,
     }
 }
 
-void
+static void
 ac_intercept(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
 	     struct emp_qelem *def_list, natid def_own, coord x, coord y)
 {
@@ -572,7 +583,7 @@ ac_airtoair(struct emp_qelem *att_list, struct emp_qelem *int_list)
     }
 }
 
-int
+static int
 all_missiles(struct emp_qelem *att_list)
 {
     struct emp_qelem *qp;
@@ -687,7 +698,7 @@ ac_dog(struct plist *ap, struct plist *dp)
  * that the current queue pointer is invalid on return from the ac_planedamage
  * call.  (this has caused bugs in the past)
  */
-void
+static void
 ac_planedamage(struct plist *plp, natid from, int dam, natid other,
 	       int checkabort, int show, char *mesg)
 {
@@ -764,7 +775,7 @@ ac_planedamage(struct plist *plp, natid from, int dam, natid other,
     strcpy(mesg, dmess);
 }
 
-void
+static void
 ac_doflak(struct emp_qelem *list, struct sctstr *from)
 {
     int shell;
@@ -799,7 +810,7 @@ ac_doflak(struct emp_qelem *list, struct sctstr *from)
     }
 }
 
-void
+static void
 ac_shipflak(struct emp_qelem *list, coord x, coord y)
 {
     struct nstr_item ni;
@@ -869,7 +880,7 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
     }
 }
 
-void
+static void
 ac_landflak(struct emp_qelem *list, coord x, coord y)
 {
     struct nstr_item ni;
@@ -937,7 +948,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
 /*
  * Called from shipflak, landflak, and doflak.
  */
-void
+static void
 ac_fireflak(struct emp_qelem *list, natid from, natid other, int guns)
 {
     struct plnstr *pp;
@@ -1097,7 +1108,7 @@ getilist(struct emp_qelem *list, natid own, struct emp_qelem *a,
 
 
 
-int
+static int
 can_fly(int p)
 {				/* Can this plane fly from the ship or land unit it is on? */
     struct plnstr plane;
@@ -1150,7 +1161,7 @@ can_fly(int p)
     return 0;
 }
 
-int
+static int
 do_evade(struct emp_qelem *bomb_list, struct emp_qelem *esc_list)
 {
     struct emp_qelem *qp;
diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 052aece3..034d9717 100644
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -77,6 +77,7 @@ static int get_ototal(int combat_mode, struct combat *off,
 		      struct emp_qelem *olist, double osupport, int check);
 static int get_dtotal(struct combat *def, struct emp_qelem *list,
 		      double dsupport, int check);
+static double att_calcodds(int, int);
 static int take_casualty(int combat_mode, struct combat *off,
 			 struct emp_qelem *olist);
 
diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c
index afa40eb7..0adfd552 100644
--- a/src/lib/subs/getbit.c
+++ b/src/lib/subs/getbit.c
@@ -142,7 +142,7 @@ emp_setbit(int x, int y, unsigned char *bitmap)
     bitmap[id / 8] |= bit(id & 07);
 }
 
-void
+static void
 emp_setbitmap(int x, int y, unsigned char *bitmap, int *bitmaps)
 {
     register int *mp;
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 9a4e4dfc..19d4d565 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -54,6 +54,7 @@
 #include "prototypes.h"
 
 static void lnd_mess(char *, struct llist *);
+static int lnd_hit_mine(struct lndstr *, struct lchrstr *);
 
 int
 attack_val(int combat_mode, struct lndstr *lp)
@@ -1006,7 +1007,7 @@ lnd_hardtarget(struct lndstr *lp)
 		  (double)lp->lnd_spd / 2.0 - lp->lnd_vis));
 }
 
-int
+static int
 lnd_hit_mine(struct lndstr *lp, struct lchrstr *lcp)
 {
     double m;
diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index e5f12995..7d9f1acc 100644
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -59,7 +59,7 @@ struct ccode {
     char *desc[2];
 };
 
-struct ccode conditions[] = {
+static struct ccode conditions[] = {
     { 'i', { "retreated with a damaged friend",
 	     "was damaged" } },
     { 't', { "retreated with a torpedoed ship",
diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c
index 9ae04c05..05c88b3c 100644
--- a/src/lib/update/bp.c
+++ b/src/lib/update/bp.c
@@ -44,7 +44,7 @@
 static int bud_key[I_MAX + 2] =
     { 1, 2, 3, 4, 0, 0, 0, 0, 0, 0, 5, 6, 0, 0, 7 };
 
-int *
+static int *
 get_wp(int *bp, struct sctstr *sp, int cm)
 {
     return (bp + (sp->sct_x + (sp->sct_y * WORLD_X)) +
diff --git a/src/server/main.c b/src/server/main.c
index aa3c407c..fbafe105 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -81,7 +81,7 @@ static void loc_NTTerm(void);
 static char pidfname[] = "server.pid";
 
 /* Run as daemon?  If yes, detach from controlling terminal etc. */
-int daemonize = 1;
+static int daemonize = 1;
 
 static void
 print_usage(char *program_name)