diff --git a/lib/libossaudio/Makefile b/lib/libossaudio/Makefile
index ced6752ee02c..f3e6e678921b 100644
--- a/lib/libossaudio/Makefile
+++ b/lib/libossaudio/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.9 2012/03/21 10:08:30 matt Exp $
+#	$NetBSD: Makefile,v 1.10 2012/05/05 15:57:45 christos Exp $
 
-WARNS=	2
+WARNS=	5
 
 LIB=	ossaudio
 MAN=	ossaudio.3
diff --git a/lib/libossaudio/ossaudio.c b/lib/libossaudio/ossaudio.c
index 56107aba9fb5..d6547bf50025 100644
--- a/lib/libossaudio/ossaudio.c
+++ b/lib/libossaudio/ossaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ossaudio.c,v 1.27 2012/05/04 11:48:12 christos Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.28 2012/05/05 15:57:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.27 2012/05/04 11:48:12 christos Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.28 2012/05/05 15:57:45 christos Exp $");
 
 /*
  * This is an OSS (Linux) sound API emulator.
@@ -549,7 +549,7 @@ getdevinfo(int fd)
 	mixer_devinfo_t mi;
 	int i, j, e;
 	static struct {
-		char *name;
+		const char *name;
 		int code;
 	} *dp, devs[] = {
 		{ AudioNmicrophone,	SOUND_MIXER_MIC },
@@ -574,7 +574,7 @@ getdevinfo(int fd)
 /*		{ AudioNmixerout,	?? },*/
 		{ 0, -1 }
 	};
-	static struct audiodevinfo devcache = { 0 };
+	static struct audiodevinfo devcache = { .done = 0 };
 	struct audiodevinfo *di = &devcache;
 	struct stat sb;
 	size_t mlen, dlen;
@@ -826,7 +826,7 @@ static void
 setblocksize(int fd, struct audio_info *info)
 {
 	struct audio_info set;
-	int s;
+	size_t s;
 
 	if (info->blocksize & (info->blocksize-1)) {
 		for(s = 32; s < info->blocksize; s <<= 1)
diff --git a/lib/libossaudio/soundcard.h b/lib/libossaudio/soundcard.h
index ac439ccf4249..c4debe7f1aee 100644
--- a/lib/libossaudio/soundcard.h
+++ b/lib/libossaudio/soundcard.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: soundcard.h,v 1.21 2012/05/05 15:04:57 christos Exp $	*/
+/*	$NetBSD: soundcard.h,v 1.22 2012/05/05 15:57:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -297,7 +297,7 @@ typedef struct buffmem_desc {
  * else we depend on <sys/ioctl.h> to do it for us. We do it this way, so
  * that we don't define the prototype twice.
  */
-#ifndef _SYS_IOCTL_H
+#ifndef _SYS_IOCTL_H_
 #include <sys/ioctl.h>
 #else
 __BEGIN_DECLS