diff --git a/linux/alsarawmidi/JackALSARawMidiInputPort.h b/linux/alsarawmidi/JackALSARawMidiInputPort.h
index fc261ed1..2423363d 100644
--- a/linux/alsarawmidi/JackALSARawMidiInputPort.h
+++ b/linux/alsarawmidi/JackALSARawMidiInputPort.h
@@ -22,8 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackALSARawMidiPort.h"
 #include "JackALSARawMidiReceiveQueue.h"
-#include "JackMidiAsyncQueue.h"
-#include "JackMidiBufferWriteQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawInputWriteQueue.h"
 
 namespace Jack {
diff --git a/linux/alsarawmidi/JackALSARawMidiOutputPort.h b/linux/alsarawmidi/JackALSARawMidiOutputPort.h
index 31a20213..230e83c4 100644
--- a/linux/alsarawmidi/JackALSARawMidiOutputPort.h
+++ b/linux/alsarawmidi/JackALSARawMidiOutputPort.h
@@ -22,8 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackALSARawMidiPort.h"
 #include "JackALSARawMidiSendQueue.h"
-#include "JackMidiAsyncQueue.h"
-#include "JackMidiBufferReadQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawOutputWriteQueue.h"
 
 namespace Jack {
diff --git a/linux/alsarawmidi/JackALSARawMidiReceiveQueue.cpp b/linux/alsarawmidi/JackALSARawMidiReceiveQueue.cpp
index 61af8e91..ccced69b 100644
--- a/linux/alsarawmidi/JackALSARawMidiReceiveQueue.cpp
+++ b/linux/alsarawmidi/JackALSARawMidiReceiveQueue.cpp
@@ -21,6 +21,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackError.h"
 #include "JackMidiUtil.h"
 
+/* Somehow the compiler doesn't accept my typedef in JackMidi.h */
+typedef jack_event_data_t            jack_midi_data_t;
+typedef jack_event_t                 jack_midi_event_t;
+
 using Jack::JackALSARawMidiReceiveQueue;
 
 JackALSARawMidiReceiveQueue::
diff --git a/linux/alsarawmidi/JackALSARawMidiReceiveQueue.h b/linux/alsarawmidi/JackALSARawMidiReceiveQueue.h
index ffe4ea5f..62d216ba 100644
--- a/linux/alsarawmidi/JackALSARawMidiReceiveQueue.h
+++ b/linux/alsarawmidi/JackALSARawMidiReceiveQueue.h
@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <alsa/asoundlib.h>
 
-#include "JackMidiReceiveQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {
 
diff --git a/linux/alsarawmidi/JackALSARawMidiSendQueue.h b/linux/alsarawmidi/JackALSARawMidiSendQueue.h
index a420e96c..0670beb7 100644
--- a/linux/alsarawmidi/JackALSARawMidiSendQueue.h
+++ b/linux/alsarawmidi/JackALSARawMidiSendQueue.h
@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <alsa/asoundlib.h>
 
-#include "JackMidiSendQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {
 
diff --git a/linux/firewire/JackFFADOMidiInputPort.h b/linux/firewire/JackFFADOMidiInputPort.h
index f4c70a80..56eeeb26 100644
--- a/linux/firewire/JackFFADOMidiInputPort.h
+++ b/linux/firewire/JackFFADOMidiInputPort.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFFADOMidiInputPort__
 
 #include "JackFFADOMidiReceiveQueue.h"
-#include "JackMidiBufferWriteQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawInputWriteQueue.h"
 
 namespace Jack {
diff --git a/linux/firewire/JackFFADOMidiOutputPort.h b/linux/firewire/JackFFADOMidiOutputPort.h
index 4ca309bb..106f1115 100644
--- a/linux/firewire/JackFFADOMidiOutputPort.h
+++ b/linux/firewire/JackFFADOMidiOutputPort.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFFADOMidiOutputPort__
 
 #include "JackFFADOMidiSendQueue.h"
-#include "JackMidiBufferReadQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawOutputWriteQueue.h"
 
 namespace Jack {
diff --git a/linux/firewire/JackFFADOMidiReceiveQueue.cpp b/linux/firewire/JackFFADOMidiReceiveQueue.cpp
index 4b67f329..e1802ad1 100644
--- a/linux/firewire/JackFFADOMidiReceiveQueue.cpp
+++ b/linux/firewire/JackFFADOMidiReceiveQueue.cpp
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackFFADOMidiReceiveQueue.h"
 #include "JackMidiUtil.h"
 
+/* Somehow the compiler doesn't accept my typedef in JackMidi.h */
+typedef jack_event_data_t            jack_midi_data_t;
+typedef jack_event_t                 jack_midi_event_t;
+
 using Jack::JackFFADOMidiReceiveQueue;
 
 JackFFADOMidiReceiveQueue::JackFFADOMidiReceiveQueue()
diff --git a/linux/firewire/JackFFADOMidiReceiveQueue.h b/linux/firewire/JackFFADOMidiReceiveQueue.h
index 7647869d..d4e49dc9 100644
--- a/linux/firewire/JackFFADOMidiReceiveQueue.h
+++ b/linux/firewire/JackFFADOMidiReceiveQueue.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackFFADOMidiReceiveQueue__
 #define __JackFFADOMidiReceiveQueue__
 
-#include "JackMidiReceiveQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {
 
diff --git a/linux/firewire/JackFFADOMidiSendQueue.h b/linux/firewire/JackFFADOMidiSendQueue.h
index f395f13d..49d54777 100644
--- a/linux/firewire/JackFFADOMidiSendQueue.h
+++ b/linux/firewire/JackFFADOMidiSendQueue.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackFFADOMidiSendQueue__
 #define __JackFFADOMidiSendQueue__
 
-#include "JackMidiSendQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {