Today's CURRENT fails while building libs

My make.conf contains only the following ``non-standard'' things:

     CFLAGS?= -O -pipe
     COPTFLAGS= -O -pipe

Today's current failed to build in various places.  The first was libsmb 
with warnings about type-punned pointers.  The following diff fixed 
buildworld for a while (it broke elsewhere, a bit later, see below):

%%%
Index: mbuf.c
===================================================================
RCS file: /home/ncvs/src/contrib/smbfs/lib/smb/mbuf.c,v
retrieving revision 1.2
diff -u -r1.2 mbuf.c
--- mbuf.c	19 Oct 2004 17:44:31 -0000	1.2
+++ mbuf.c	5 Nov 2004 11:43:29 -0000
_at__at_ -195,7 +195,8 _at__at_
   * Routines to put data in a buffer
   */
  #define	MB_PUT(t)	int error; t *p; \
-			if ((error = mb_fit(mbp, sizeof(t), (char**)&p)) != 0) \
+			if ((error = mb_fit(mbp, sizeof(t), \
+			    (char**)(void *)&p)) != 0) \
  				return error

  /*
Index: nbns_rq.c
===================================================================
RCS file: /home/ncvs/src/contrib/smbfs/lib/smb/nbns_rq.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 nbns_rq.c
--- nbns_rq.c	14 Dec 2001 11:06:03 -0000	1.1.1.1
+++ nbns_rq.c	5 Nov 2004 11:43:46 -0000
_at__at_ -237,7 +237,7 _at__at_
  		if (rqp->nr_qdcount > 1)
  			return EINVAL;
  		len = nb_name_len(rqp->nr_qdname);
-		error = mb_fit(mbp, len, (char**)&cp);
+		error = mb_fit(mbp, len, (char**)(void *)&cp);
  		if (error)
  			return error;
  		nb_name_encode(rqp->nr_qdname, cp);
%%%

Later the build failed in libthread_db, and I had to use this:

%%%
Index: lib/libthread_db/libpthread_db.c
===================================================================
RCS file: /home/ncvs/src/lib/libthread_db/libpthread_db.c,v
retrieving revision 1.6
diff -u -r1.6 libpthread_db.c
--- lib/libthread_db/libpthread_db.c	16 Aug 2004 05:20:12 -0000	1.6
+++ lib/libthread_db/libpthread_db.c	5 Nov 2004 11:49:49 -0000
_at__at_ -943,7 +943,7 _at__at_
  {
  	char *obj_entry;
  	const td_thragent_t *ta = th->th_ta;
-	psaddr_t tcb_addr, *dtv_addr, tcb_tp;
+	psaddr_t tcb_addr, *dtv_addr;
  	int tls_index, ret;

  	/* linkmap is a member of Obj_Entry */
Index: lib/libthread_db/libthr_db.c
===================================================================
RCS file: /home/ncvs/src/lib/libthread_db/libthr_db.c,v
retrieving revision 1.2
diff -u -r1.2 libthr_db.c
--- lib/libthread_db/libthr_db.c	13 Aug 2004 06:47:33 -0000	1.2
+++ lib/libthread_db/libthr_db.c	5 Nov 2004 11:53:33 -0000
_at__at_ -294,7 +294,6 _at__at_
  libthr_db_thr_getgregs(const td_thrhandle_t *th, prgregset_t r)
  {
  	const td_thragent_t *ta;
-	psaddr_t addr;
  	ps_err_e err;

  	ta = th->th_ta;
%%%

This is a bit weird.  Is CURRENT very broken today, or am I doing 
something wrong?