diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h
--- a/sys/dev/sound/midi/midi.h
+++ b/sys/dev/sound/midi/midi.h
@@ -29,7 +29,6 @@
 #ifndef MIDI_H
 #define MIDI_H
 
-#include <sys/types.h>
 #include <sys/malloc.h>
 
 MALLOC_DECLARE(M_MIDI);
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -32,23 +32,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/queue.h>
+#include <sys/types.h>
 #include <sys/kernel.h>
-#include <sys/lock.h>
+#include <sys/queue.h>
 #include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
 #include <sys/conf.h>
 #include <sys/selinfo.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
 #include <sys/sx.h>
-#include <sys/proc.h>
 #include <sys/fcntl.h>
-#include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/poll.h>
-#include <sys/sbuf.h>
 #include <sys/kobj.h>
 #include <sys/module.h>
 
@@ -57,9 +51,10 @@
 #endif
 
 #include <dev/sound/midi/midi.h>
+#include <dev/sound/midi/midiq.h>
+
 #include "mpu_if.h"
 
-#include <dev/sound/midi/midiq.h>
 MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area");
 
 #define MIDI_NAMELEN   16
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -27,17 +27,11 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
 #include <sys/kobj.h>
-#include <sys/malloc.h>
-#include <sys/bus.h>			/* to get driver_intr_t */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_snd.h"