diff --git a/lib/libc/rpc/xdr.c b/lib/libc/rpc/xdr.c
index 2e955e52ff26..e084d0de3bd6 100644
--- a/lib/libc/rpc/xdr.c
+++ b/lib/libc/rpc/xdr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xdr.c,v 1.27 2003/07/26 19:24:50 salo Exp $	*/
+/*	$NetBSD: xdr.c,v 1.28 2006/05/14 02:15:31 christos Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
 static char *sccsid = "@(#)xdr.c 1.35 87/08/12";
 static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: xdr.c,v 1.27 2003/07/26 19:24:50 salo Exp $");
+__RCSID("$NetBSD: xdr.c,v 1.28 2006/05/14 02:15:31 christos Exp $");
 #endif
 #endif
 
@@ -766,7 +766,7 @@ xdr_string(xdrs, cpp, maxsize)
 	u_int maxsize;
 {
 	char *sp;  		/* sp is the actual string pointer */
-	u_int size;
+	u_int size = 0;		/* XXX: GCC */
 	u_int nodesize;
 
 	_DIAGASSERT(xdrs != NULL);
diff --git a/lib/libpthread_dbg/pthread_dbg.c b/lib/libpthread_dbg/pthread_dbg.c
index 521c7e174422..9a16a2792ad8 100644
--- a/lib/libpthread_dbg/pthread_dbg.c
+++ b/lib/libpthread_dbg/pthread_dbg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_dbg.c,v 1.30 2004/10/12 22:17:56 mycroft Exp $	*/
+/*	$NetBSD: pthread_dbg.c,v 1.31 2006/05/14 02:16:36 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_dbg.c,v 1.30 2004/10/12 22:17:56 mycroft Exp $");
+__RCSID("$NetBSD: pthread_dbg.c,v 1.31 2006/05/14 02:16:36 christos Exp $");
 
 #define __EXPOSE_STACK 1
 #include <sys/param.h>
@@ -1076,7 +1076,7 @@ td_thr_suspend(td_thread_t *thread)
 	int tmp, tmp1, val;
 	caddr_t addr, sp, nthreadaddr, qaddr;
 	size_t rsize, ucsize;
-	td_thread_t *nthread;
+	td_thread_t *nthread = NULL; /* XXX: GCC */
 	ucontext_t uc, *ucp;
 	struct pthread_queue_t qhead;