=== modified file 'mixxx/src/mididevicehandler.cpp'
--- mixxx/src/mididevicehandler.cpp	2009-05-03 02:34:18 +0000
+++ mixxx/src/mididevicehandler.cpp	2009-07-18 16:48:44 +0000
@@ -1,3 +1,9 @@
+// NOTE: CoreMIDI must be defined first to avoid qDebug macro/function conflict
+//       with Qt headers.
+#ifdef __COREMIDI__
+  #include "midiobjectcoremidi.h"
+#endif
+
 #include "mididevicehandler.h"
 #include "midiobject.h"
 
@@ -18,9 +24,6 @@
   #include "midiobjectportmidi.h"
 #endif
 
-#ifdef __COREMIDI__
-  #include "midiobjectcoremidi.h"
-#endif
 
 #ifdef __OSSMIDI__
   #include "midiobjectoss.h"

=== modified file 'mixxx/src/midiobjectcoremidi.cpp'
--- mixxx/src/midiobjectcoremidi.cpp	2009-04-15 05:02:12 +0000
+++ mixxx/src/midiobjectcoremidi.cpp	2009-07-18 16:46:01 +0000
@@ -15,8 +15,11 @@
 *                                                                         *
 ***************************************************************************/
 
+// NOTE: The #include order is important, since the CoreMIDI headers
+//       have to be included before Qt headers (CoreMIDI uses qDebug
+//       as a define, and Qt has a qDebug() function!)
+#include "midiobjectcoremidi.h"
 #include <QtCore>
-#include "midiobjectcoremidi.h"
 
 static QString toHex(QString numberStr) {
     return "0x" + QString("0" + QString::number(numberStr.toUShort(), 16).toUpper()).right(2);

=== modified file 'mixxx/src/midiobjectcoremidi.h'
--- mixxx/src/midiobjectcoremidi.h	2009-03-14 06:58:45 +0000
+++ mixxx/src/midiobjectcoremidi.h	2009-07-18 16:47:07 +0000
@@ -18,9 +18,9 @@
 #ifndef MIDIOBJECTCOREMIDI_H
 #define MIDIOBJECTCOREMIDI_H
 
-#include "midiobject.h"
-
-#include <QtCore>
+// NOTE: The #include order is important: the CoreMIDI headers
+//       have to be included before Qt headers (CoreMIDI uses qDebug
+//       as a define, and Qt has a qDebug() function!)
 
 #include <CoreFoundation/CoreFoundation.h>
 // #include <CoreAudio/CoreAudio.h>
@@ -29,6 +29,10 @@
 // #include <CoreMIDI/CoreMIDI.h>
 #include <CoreMIDI/MIDIServices.h>
 
+#include "midiobject.h"
+
+#include <QtCore>
+
 #define COREMIDI_SYSEX_QUEUE_SIZE 32 
 
 /**