diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 0331287a519e..8441ce5ee9a8 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -85,25 +85,24 @@ static const char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 
 #include "extern.h"
 
-struct timeval	boottime;
-struct utmpx   *utmp;
-struct winsize	ws;
-kvm_t	       *kd;
-time_t		now;		/* the current time of day */
-int		ttywidth;	/* width of tty */
-int		argwidth;	/* width of tty */
-int		header = 1;	/* true if -h flag: don't print heading */
-int		nflag;		/* true if -n flag: don't convert addrs */
-int		dflag;		/* true if -d flag: output debug info */
-int		sortidle;	/* sort by idle time */
+static struct utmpx *utmp;
+static struct winsize ws;
+static kvm_t   *kd;
+static time_t	now;		/* the current time of day */
+static int	ttywidth;	/* width of tty */
+static int	argwidth;	/* width of tty */
+static int	header = 1;	/* true if -h flag: don't print heading */
+static int	nflag;		/* true if -n flag: don't convert addrs */
+static int	dflag;		/* true if -d flag: output debug info */
+static int	sortidle;	/* sort by idle time */
 int		use_ampm;	/* use AM/PM time */
-int             use_comma;      /* use comma as floats separator */
-char	      **sel_users;	/* login array of particular users selected */
+static int	use_comma;      /* use comma as floats separator */
+static char   **sel_users;	/* login array of particular users selected */
 
 /*
  * One of these per active utmp entry.
  */
-struct	entry {
+static struct entry {
 	struct	entry *next;
 	struct	utmpx utmp;
 	dev_t	tdev;			/* dev_t of terminal */