diff --git a/src/SOUND/midi.c b/src/SOUND/midi.c
index 6f3de8fba..78de8f192 100644
--- a/src/SOUND/midi.c
+++ b/src/SOUND/midi.c
@@ -138,18 +138,18 @@ void midi_close()
 
 void midi_poll()
 {
-        if (m_device && m_device->poll) m_device->poll();
+        if (m_device && m_device->poll) m_device->poll(m_device);
 }
 
 void play_msg(uint8_t *msg)
 {
-        if (m_device->play_msg) m_device->play_msg(msg);
+        if (m_device->play_msg) m_device->play_msg(m_device, msg);
 }
 
 
 void play_sysex(uint8_t *sysex, unsigned int len)
 {
-        if (m_device->play_sysex) m_device->play_sysex(sysex, len);
+        if (m_device->play_sysex) m_device->play_sysex(m_device, sysex, len);
 }
 
 #define SYSEX_SIZE 1024
@@ -159,7 +159,7 @@ void midi_write(uint8_t val)
 {
         if (!m_device) return;
 
-        if (m_device->write && m_device->write(val)) return;
+        if (m_device->write && m_device->write(m_device, val)) return;
 
         uint32_t passed_ticks;
 
diff --git a/src/WIN/win.c b/src/WIN/win.c
index c843660e5..a924aec74 100644
--- a/src/WIN/win.c
+++ b/src/WIN/win.c
@@ -42,6 +42,7 @@
 #include "../video/video.h"
 #include "../video/vid_ega.h"
 #include "../mouse.h"
+#include "../sound/midi.h"
 #include "../sound/sound.h"
 #include "../sound/snd_dbopl.h"
 #include "plat_keyboard.h"
diff --git a/src/WIN/win_deviceconfig.c b/src/WIN/win_deviceconfig.c
index 3cce23331..21d0f5556 100644
--- a/src/WIN/win_deviceconfig.c
+++ b/src/WIN/win_deviceconfig.c
@@ -18,6 +18,7 @@
 #include "../ibm.h"
 #include "../config.h"
 #include "../device.h"
+#include "../sound/midi.h"
 #include "plat_midi.h"
 #define NO_UNICODE		/*FIXME: not Unicode? */
 #include "win.h"
diff --git a/src/config.c b/src/config.c
index dd8351657..c4ec6927a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -28,8 +28,8 @@
 #include "nvr.h"
 #include "scsi.h"
 #include "win/plat_joystick.h"
-#include "win/plat_midi.h"
 #include "sound/midi.h"
+#include "win/plat_midi.h"
 #include "sound/snd_dbopl.h"
 #include "sound/snd_mpu401.h"
 #include "sound/snd_opl.h"