diff --git a/src/devices/cddadevice.h b/src/devices/cddadevice.h
index 5256ccabf..ceae9567d 100644
--- a/src/devices/cddadevice.h
+++ b/src/devices/cddadevice.h
@@ -18,9 +18,11 @@
 #ifndef CDDADEVICE_H
 #define CDDADEVICE_H
 
+#include <QMutex>
+
+// These must come after Qt includes (issue 3247)
 #include <cdio/cdio.h>
 #include <gst/cdda/gstcddabasesrc.h>
-#include <QMutex>
 
 #include "connecteddevice.h"
 #include "core/song.h"
diff --git a/src/devices/cddalister.cpp b/src/devices/cddalister.cpp
index ad5cf18e5..b5005118d 100644
--- a/src/devices/cddalister.cpp
+++ b/src/devices/cddalister.cpp
@@ -15,12 +15,14 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cdio/cdio.h>
 #include <QFileInfo>
 #include <QMutex>
 #include <QThread>
 #include <QWaitCondition>
 
+// This must come after Qt includes
+#include <cdio/cdio.h>
+
 #include "cddalister.h"
 #include "core/logging.h"
 #include "core/song.h"