3 files changed, 5 insertions, 7 deletions

diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 6ad1b4365e4e..9095c1b3955b 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -36,7 +36,6 @@ struct pcmchan_caps {
 	u_int32_t *fmtlist;
 	u_int32_t caps;
 };
-typedef struct pcmchan_caps pcmchan_caps;
 
 #define	CHN_NAMELEN	32
 struct pcm_channel {
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 81b7f1fca209..793b48adb34a 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -37,6 +37,7 @@ devclass_t pcm_devclass;
 int snd_unit = 0;
 TUNABLE_INT("hw.snd.unit", &snd_unit);
 #endif
+
 int snd_autovchans = 0;
 int snd_maxvchans = 0;
 #if __FreeBSD_version > 500000
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 934fd680a27b..3bb0b277281e 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -75,12 +75,14 @@
 #if __FreeBSD_version > 500000
 #define USING_MUTEX
 #define USING_DEVFS
-#else
-#define	INTR_TYPE_AV INTR_TYPE_TTY
 #endif
 #define SND_DYNSYSCTL
 
 #ifndef	INTR_MPSAFE
+#define	INTR_TYPE_AV	INTR_TYPE_TTY
+#endif
+
+#ifndef	INTR_MPSAFE
 #define	INTR_MPSAFE	0
 #endif
 
@@ -97,13 +99,9 @@ struct isa_device { int dummy; };
 #endif	/* _OS_H_ */
 
 struct pcm_channel;
-typedef struct pcm_channel pcm_channel;
 struct pcm_feeder;
-typedef struct pcm_feeder pcm_feeder;
 struct snd_dbuf;
-typedef struct snd_dbuf snd_dbuf;
 struct snd_mixer;
-typedef struct snd_mixer snd_mixer;
 
 #include <dev/sound/pcm/buffer.h>
 #include <dev/sound/pcm/channel.h>