diff --git a/src/device/cddadevice.h b/src/device/cddadevice.h
index 94cb23fbc..c4040a4c2 100644
--- a/src/device/cddadevice.h
+++ b/src/device/cddadevice.h
@@ -24,9 +24,6 @@
 
 #include "config.h"
 
-#include <cdio/cdio.h>
-#include <gst/audio/gstaudiocdsrc.h>
-
 #include <QObject>
 #include <QString>
 #include <QStringList>
diff --git a/src/device/cddalister.cpp b/src/device/cddalister.cpp
index 32f0059d0..622080019 100644
--- a/src/device/cddalister.cpp
+++ b/src/device/cddalister.cpp
@@ -21,6 +21,11 @@
 
 #include <config.h>
 
+#include <cstddef>
+
+#include <cdio/cdio.h>
+#include <cdio/device.h>
+
 #include <QtGlobal>
 #include <QFileInfo>
 #include <QByteArray>
@@ -30,10 +35,6 @@
 #include <QRegularExpression>
 #include <QUrl>
 
-// This must come after Qt includes
-#include <cdio/cdio.h>
-#include <cdio/device.h>
-
 #include "cddalister.h"
 #include "core/logging.h"
 
diff --git a/src/device/cddasongloader.cpp b/src/device/cddasongloader.cpp
index 16b726f01..b98e9f18a 100644
--- a/src/device/cddasongloader.cpp
+++ b/src/device/cddasongloader.cpp
@@ -24,10 +24,16 @@
 #include <memory>
 
 #include <cstddef>
+
 #include <glib.h>
 #include <glib/gtypes.h>
 #include <glib-object.h>
 
+#include <cdio/cdio.h>
+
+#include <gst/gst.h>
+#include <gst/tag/tag.h>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
@@ -35,10 +41,6 @@
 #include <QString>
 #include <QUrl>
 
-#include <cdio/cdio.h>
-#include <gst/gst.h>
-#include <gst/tag/tag.h>
-
 #include "cddasongloader.h"
 #include "includes/shared_ptr.h"
 #include "core/logging.h"
diff --git a/src/device/cddasongloader.h b/src/device/cddasongloader.h
index 0b127d6d8..4e8f38fdd 100644
--- a/src/device/cddasongloader.h
+++ b/src/device/cddasongloader.h
@@ -24,17 +24,19 @@
 
 #include "config.h"
 
+#include <cstddef>
+
+#include <cdio/types.h>
+#include <cdio/cdio.h>
+
+#include <gst/gstelement.h>
+#include <gst/audio/gstaudiocdsrc.h>
+
 #include <QObject>
 #include <QMutex>
 #include <QString>
 #include <QUrl>
 
-// These must come after Qt includes
-#include <cdio/types.h>
-#include <cdio/cdio.h>
-#include <gst/gstelement.h>
-#include <gst/audio/gstaudiocdsrc.h>
-
 #include "includes/shared_ptr.h"
 #include "core/song.h"
 #ifdef HAVE_MUSICBRAINZ