Index: lib/libc/gen/getgrent.c
===================================================================
--- lib/libc/gen/getgrent.c
+++ lib/libc/gen/getgrent.c
@@ -207,11 +207,11 @@
 grp_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	gid_t gid;
+	char *name __unused;
+	gid_t gid __unused;
 	struct group *grp;
-	char *orig_buf;
-	size_t orig_buf_size;
+	char *orig_buf __unused;
+	size_t orig_buf_size __unused;
 
 	struct group new_grp;
 	size_t desired_size, size, mem_size;
@@ -302,8 +302,8 @@
 grp_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	gid_t gid;
+	char *name __unused;
+	gid_t gid __unused;
 	struct group *grp;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -659,7 +659,7 @@
 		NS_FALLBACK_CB(getgroupmembership_fallback)
 		{ NULL, NULL, NULL }
 	};
-	int rv;
+	int rv __unused;
 
 	assert(uname != NULL);
 	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
Index: lib/libc/gen/getpwent.c
===================================================================
--- lib/libc/gen/getpwent.c
+++ lib/libc/gen/getpwent.c
@@ -257,11 +257,11 @@
 pwd_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uid_t uid;
+	char *name __unused;
+	uid_t uid __unused;
 	struct passwd *pwd;
-	char *orig_buf;
-	size_t orig_buf_size;
+	char *orig_buf __unused;
+	size_t orig_buf_size __unused;
 
 	struct passwd new_pwd;
 	size_t desired_size, size;
@@ -361,8 +361,8 @@
 pwd_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uid_t uid;
+	char *name __unused;
+	uid_t uid __unused;
 	struct passwd *pwd;
 	char *orig_buf;
 	size_t orig_buf_size;
Index: lib/libc/net/gethostbydns.c
===================================================================
--- lib/libc/net/gethostbydns.c
+++ lib/libc/net/gethostbydns.c
@@ -471,7 +471,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct hostent *hptr, he;
 	struct hostent_data *hed;
 	querybuf *buf;
@@ -562,7 +563,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	const u_char *uaddr;
 	struct hostent *hptr, he;
 	struct hostent_data *hed;
Index: lib/libc/net/gethostbyht.c
===================================================================
--- lib/libc/net/gethostbyht.c
+++ lib/libc/net/gethostbyht.c
@@ -224,7 +224,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct hostent *hptr, he;
 	struct hostent_data *hed;
 	char **cp;
@@ -289,7 +290,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct hostent *hptr, he;
 	struct hostent_data *hed;
 	res_state statp;
Index: lib/libc/net/gethostbynis.c
===================================================================
--- lib/libc/net/gethostbynis.c
+++ lib/libc/net/gethostbynis.c
@@ -261,7 +261,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct hostent *hptr, he;
 	struct hostent_data *hed;
 	res_state statp;
@@ -310,7 +311,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct hostent *hptr, he;
 	struct hostent_data *hed;
 	res_state statp;
Index: lib/libc/net/gethostnamadr.c
===================================================================
--- lib/libc/net/gethostnamadr.c
+++ lib/libc/net/gethostnamadr.c
@@ -263,10 +263,10 @@
 host_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
+	char *str __unused;
+	void *addr __unused;
+	socklen_t len __unused;
+	int type __unused;
 	struct hostent *ht;
 
 	struct hostent new_ht;
@@ -369,10 +369,10 @@
 host_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
+	char *str __unused;
+	void *addr __unused;
+	socklen_t len __unused;
+	int type __unused;
 	struct hostent *ht;
 
 	char *p;
Index: lib/libc/net/getnetbydns.c
===================================================================
--- lib/libc/net/getnetbydns.c
+++ lib/libc/net/getnetbydns.c
@@ -266,7 +266,8 @@
 	int net_type;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct netent *nptr, ne;
 	struct netent_data *ned;
 	unsigned int netbr[4];
@@ -373,7 +374,8 @@
 	const char *net;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct netent *nptr, ne;
 	struct netent_data *ned;
 	int anslen, error;
Index: lib/libc/net/getnetbyht.c
===================================================================
--- lib/libc/net/getnetbyht.c
+++ lib/libc/net/getnetbyht.c
@@ -193,7 +193,8 @@
 	const char *name;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused
+	int *h_errnop;
 	struct netent *nptr, ne;
 	struct netent_data *ned;
 	char **cp;
@@ -246,7 +247,7 @@
 	int type;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *h_errnop;
 	struct netent *nptr, ne;
 	struct netent_data *ned;
 	res_state statp;
Index: lib/libc/net/getnetbynis.c
===================================================================
--- lib/libc/net/getnetbynis.c
+++ lib/libc/net/getnetbynis.c
@@ -136,7 +136,8 @@
 	const char *name;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct netent *nptr, ne;
 	struct netent_data *ned;
 	res_state statp;
@@ -181,7 +182,8 @@
 	int af;
 	char *buffer;
 	size_t buflen;
-	int *errnop, *h_errnop;
+	int *errnop __unused;
+	int *h_errnop;
 	struct netent *nptr, ne;
 	struct netent_data *ned;
 	char *str, *cp;
Index: lib/libc/net/getnetnamadr.c
===================================================================
--- lib/libc/net/getnetnamadr.c
+++ lib/libc/net/getnetnamadr.c
@@ -126,12 +126,12 @@
 net_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uint32_t net;
-	int type;
+	char *name __unused;
+	uint32_t net __unused;
+	int type __unused;
 	struct netent *ne;
-	char *orig_buf;
-	size_t orig_buf_size;
+	char *orig_buf __unused;
+	size_t orig_buf_size __unused;
 
 	struct netent new_ne;
 	size_t desired_size, size, aliases_size;
@@ -215,9 +215,9 @@
 net_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uint32_t net;
-	int type;
+	char *name __unused;
+	uint32_t net __unused;
+	int type __unused;
 	struct netent *ne;
 	char *orig_buf;
 	size_t orig_buf_size;
Index: lib/libc/net/getprotoent.c
===================================================================
--- lib/libc/net/getprotoent.c
+++ lib/libc/net/getprotoent.c
@@ -143,11 +143,11 @@
 __proto_marshal_func(char *buffer, size_t *buffer_size, void *retval,
     va_list ap, void *cache_mdata)
 {
-	char *name;
-	int num;
+	char *name __unused;
+	int num __unused;
 	struct protoent *proto;
-	char *orig_buf;
-	size_t orig_buf_size;
+	char *orig_buf __unused;
+	size_t orig_buf_size __unused;
 
 	struct protoent new_proto;
 	size_t desired_size, size, aliases_size;
@@ -230,8 +230,8 @@
 __proto_unmarshal_func(char *buffer, size_t buffer_size, void *retval,
     va_list ap, void *cache_mdata)
 {
-	char *name;
-	int num;
+	char *name __unused;
+	int num __unused;
 	struct protoent *proto;
 	char *orig_buf;
 	size_t orig_buf_size;
Index: lib/libc/net/getservent.c
===================================================================
--- lib/libc/net/getservent.c
+++ lib/libc/net/getservent.c
@@ -939,12 +939,12 @@
 serv_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	char *proto;
-	int port;
+	char *name __unused;
+	char *proto __unused;
+	int port __unused;
 	struct servent *serv;
-	char *orig_buf;
-	size_t orig_buf_size;
+	char *orig_buf __unused;
+	size_t orig_buf_size __unused;
 
 	struct servent new_serv;
 	size_t desired_size;
@@ -1040,9 +1040,9 @@
 serv_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	char *proto;
-	int port;
+	char *name __unused;
+	char *proto __unused;
+	int port __unused;
 	struct servent *serv;
 	char *orig_buf;
 	char *p;
Index: lib/libc/net/nscachedcli.c
===================================================================
--- lib/libc/net/nscachedcli.c
+++ lib/libc/net/nscachedcli.c
@@ -145,7 +145,7 @@
 	struct kevent eventlist;
 	int nevents;
 	ssize_t result;
-	int res;
+	int res __unused;
 
 	struct msghdr cred_hdr;
 	struct iovec iov;
@@ -474,7 +474,7 @@
 __close_cached_mp_write_session(struct cached_connection_ *ws)
 {
 	int notification;
-	int result;
+	int result __unused;
 
 	notification = CET_MP_WRITE_SESSION_CLOSE_NOTIFICATION;
 	result = safe_write(ws, &notification, sizeof(int));
Index: lib/libc/posix1e/acl_delete_entry.c
===================================================================
--- lib/libc/posix1e/acl_delete_entry.c
+++ lib/libc/posix1e/acl_delete_entry.c
@@ -74,7 +74,7 @@
 int
 acl_delete_entry(acl_t acl, acl_entry_t entry_d)
 {
-	struct acl *acl_int;
+	struct acl *acl_int __unused;
 	struct acl_entry entry_int;
 	int i, j, found = 0;
 
Index: lib/libc/regex/engine.c
===================================================================
--- lib/libc/regex/engine.c
+++ lib/libc/regex/engine.c
@@ -385,7 +385,7 @@
 	const char *ssp;	/* start of string matched by subsubRE */
 	const char *sep;	/* end of string matched by subsubRE */
 	const char *oldssp;	/* previous ssp */
-	const char *dp;
+	const char *dp __unused;	/* actually used for assert checks */
 
 	AT("diss", start, stop, startst, stopst);
 	sp = start;
Index: lib/libc/rpc/getrpcent.c
===================================================================
--- lib/libc/rpc/getrpcent.c
+++ lib/libc/rpc/getrpcent.c
@@ -646,11 +646,11 @@
 rpc_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	int num;
+	char *name __unused;
+	int num __unused;
 	struct rpcent *rpc;
-	char *orig_buf;
-	size_t orig_buf_size;
+	char *orig_buf __unused;
+	size_t orig_buf_size __unused;
 
 	struct rpcent new_rpc;
 	size_t desired_size, size, aliases_size;
@@ -733,8 +733,8 @@
 rpc_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	int num;
+	char *name __unused;
+	int num __unused;
 	struct rpcent *rpc;
 	char *orig_buf;
 	size_t orig_buf_size;
Index: lib/libc/stdio/vfwscanf.c
===================================================================
--- lib/libc/stdio/vfwscanf.c
+++ lib/libc/stdio/vfwscanf.c
@@ -266,7 +266,7 @@
 static __inline int
 convert_wstring(FILE *fp, wchar_t *wcp, int width, locale_t locale)
 {
-	wchar_t *wcp0;
+	wchar_t *wcp0 __unused;
 	wint_t wi;
 	int nread;