diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 4b8794f317e7..458971f893c5 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$");
 
 extern bool_t xdr_ypresp_all_seq(XDR *, unsigned long *);
 
-int (*ypresp_allfn)();
-void *ypresp_data;
+static int (*ypresp_allfn)();
+static void *ypresp_data;
 extern DB *specdbp;
 extern enum ypstat yp_errno;
 
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index 03a30f6307c8..03ebbe12fcaf 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -54,12 +54,12 @@ __FBSDID("$FreeBSD$");
 char *progname = "ypxfr";
 char *yp_dir = _PATH_YP;
 int _rpcpmstart = 0;
-int ypxfr_use_yplib = 0; /* Assume the worst. */
-int ypxfr_clear = 1;
-int ypxfr_prognum = 0;
-struct sockaddr_in ypxfr_callback_addr;
-struct yppushresp_xfr ypxfr_resp;
-DB *dbp;
+static int ypxfr_use_yplib = 0; /* Assume the worst. */
+static int ypxfr_clear = 1;
+static int ypxfr_prognum = 0;
+static struct sockaddr_in ypxfr_callback_addr;
+static struct yppushresp_xfr ypxfr_resp;
+static DB *dbp;
 
 static void
 ypxfr_exit(ypxfrstat retval, char *temp)
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index b1424ac552fc..a5ac92da578d 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include "ypxfr_extern.h"
 
-int fp = 0;
+static int fp = 0;
 
 static bool_t
 xdr_my_xfr(register XDR *xdrs, xfr *objp)
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 3484bc9c1f4c..b3d90336c61a 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -47,9 +47,9 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-struct ypalias {
+const struct ypalias {
 	char *alias, *name;
-} ypaliases[] = {
+} static ypaliases[] = {
 	{ "passwd", "passwd.byname" },
 	{ "master.passwd", "master.passwd.byname" },
 	{ "shadow", "shadow.byname" },
@@ -62,7 +62,7 @@ struct ypalias {
 	{ "ethers", "ethers.byname" },
 };
 
-int key;
+static int key;
 
 static void
 usage(void)
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index a9c32ea72c48..d6b58c2c5d31 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -47,9 +47,9 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-struct ypalias {
+const struct ypalias {
 	char *alias, *name;
-} ypaliases[] = {
+} static ypaliases[] = {
 	{ "passwd", "passwd.byname" },
 	{ "master.passwd", "master.passwd.byname" },
 	{ "shadow", "shadow.byname" },
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index b31dcae2cb6c..d02461ebafb9 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -59,9 +59,9 @@ __FBSDID("$FreeBSD$");
 
 extern bool_t xdr_domainname();
 
-struct ypalias {
+const struct ypalias {
 	char *alias, *name;
-} ypaliases[] = {
+} static ypaliases[] = {
 	{ "passwd", "passwd.byname" },
 	{ "master.passwd", "master.passwd.byname" },
 	{ "shadow", "shadow.byname" },
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index f1f629a42b5b..290e40500de6 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include "ypxfr_extern.h"
 
 char *yp_dir = "";	/* No particular default needed. */
-int _rpcpmstart = 0;
 int debug = 1;
 
 static void
@@ -66,7 +65,6 @@ usage(void)
 }
 
 #define PERM_SECURE (S_IRUSR|S_IWUSR)
-
 static DB *
 open_db(char *path, int flags)
 {
@@ -185,7 +183,6 @@ main(int argc, char *argv[])
 	 * write to stdout; the db library doesn't let you
 	 * write to a file stream like that.
 	 */
-
 	if (!strcmp(infile, "-")) {
 		ifp = stdin;
 	} else {
@@ -327,7 +324,6 @@ main(int argc, char *argv[])
 	(void)(dbp->close)(dbp);
 
 doclear:
-
 	if (clear) {
 		char in = 0;
 		char *out = NULL;
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index 6c665158c4ad..5a712e5a41b0 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -58,15 +58,15 @@ int debug = 1;
 int _rpcpmstart = 0;
 char *yp_dir = _PATH_YP;
 
-char *yppush_mapname = NULL;	/* Map to transfer. */
-char *yppush_domain = NULL;	/* Domain in which map resides. */
-char *yppush_master = NULL;	/* Master NIS server for said domain. */
-int skip_master = 0;		/* Do not attempt to push map to master. */
-int verbose = 0;		/* Toggle verbose mode. */
-unsigned long yppush_transid = 0;
-int yppush_timeout = 80;	/* Default timeout. */
-int yppush_jobs = 1;		/* Number of allowed concurrent jobs. */
-int yppush_running_jobs = 0;	/* Number of currently running jobs. */
+static char *yppush_mapname = NULL;	/* Map to transfer. */
+static char *yppush_domain = NULL;	/* Domain in which map resides. */
+static char *yppush_master = NULL;	/* Master NIS server for said domain. */
+static int skip_master = 0;		/* Do not attempt to push map to master. */
+static int verbose = 0;		/* Toggle verbose mode. */
+static unsigned long yppush_transid = 0;
+static int yppush_timeout = 80;	/* Default timeout. */
+static int yppush_jobs = 1;		/* Number of allowed concurrent jobs. */
+static int yppush_running_jobs = 0;	/* Number of currently running jobs. */
 
 /* Structure for holding information about a running job. */
 struct jobs {
@@ -80,8 +80,7 @@ struct jobs {
 	struct jobs *next;
 };
 
-struct jobs *yppush_joblist;	/* Linked list of running jobs. */
-
+static struct jobs *yppush_joblist;	/* Linked list of running jobs. */
 static int yppush_svc_run(int);
 
 /*
@@ -464,7 +463,8 @@ yppush_foreach(int status, char *key, int keylen, char *val, int vallen,
 	return (0);
 }
 
-static void usage()
+static void
+usage()
 {
 	fprintf (stderr, "%s\n%s\n",
 	"usage: yppush [-d domain] [-t timeout] [-j #parallel jobs] [-h host]",
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index c82f8c7bbbee..a4ba5049f20c 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
 
 extern int debug;
 
-			/* NIS v1 */
-const char *yp_procs[] = {
+static const char *yp_procs[] = {
+	/* NIS v1 */
 	"ypoldproc_null",
 	"ypoldproc_domain",
 	"ypoldproc_domain_nonack",
@@ -71,7 +71,7 @@ const char *yp_procs[] = {
 	"badproc1", /* placeholder */
 	"badproc2", /* placeholder */
 	"badproc3", /* placeholder */
-	
+
 	/* NIS v2 */
 	"ypproc_null",
 	"ypproc_domain",
@@ -93,7 +93,7 @@ struct securenet {
 	struct securenet *next;
 };
 
-struct securenet *securenets;
+static struct securenet *securenets;
 
 #define LINEBUFSZ 1024
 
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 61944dc44bbe..6a3bf1c462a0 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -405,7 +405,7 @@ yp_open_db(const char *domain, const char *map)
 #ifdef DB_CACHE
 again:
 #endif
-	dbp = dbopen(buf,O_RDONLY, PERM_SECURE, DB_HASH, NULL);
+	dbp = dbopen(buf, O_RDONLY, PERM_SECURE, DB_HASH, NULL);
 
 	if (dbp == NULL) {
 		switch (errno) {
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index 8d488f3bdb6a..a5b12902d0d1 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -46,13 +46,13 @@ __FBSDID("$FreeBSD$");
 #include "yp_extern.h"
 
 int debug;
+
 extern int _rpcpmstart;
-
 extern char *progname;
-
 static void __verr(const char *fmt, va_list ap) __printflike(1, 0);
 
-static void __verr(const char *fmt, va_list ap)
+static void
+__verr(const char *fmt, va_list ap)
 {
 	if (debug && !_rpcpmstart) {
 		fprintf(stderr,"%s: ",progname);
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index 958d3a62d18c..8c538ca8ca46 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -72,13 +72,11 @@ __FBSDID("$FreeBSD$");
 
 #define	_RPCSVC_CLOSEDOWN 120
 int _rpcpmstart;		/* Started by a port monitor ? */
-static int _rpcfdtype;
-		 /* Whether Stream or Datagram ? */
+static int _rpcfdtype;  /* Whether Stream or Datagram? */
 static int _rpcaf;
 static int _rpcfd;
 
-	/* States a server can be in wrt request */
-
+/* States a server can be in wrt request */
 #define	_IDLE 0
 #define	_SERVED 1
 #define	_SERVING 2