diff --git a/src/devices/cddadevice.cpp b/src/devices/cddadevice.cpp
index ba250f879..2962007a0 100644
--- a/src/devices/cddadevice.cpp
+++ b/src/devices/cddadevice.cpp
@@ -17,6 +17,8 @@
 
 #include "cddadevice.h"
 
+#include <QUrl>
+
 #include "deviceerror.h"
 #include "library/librarybackend.h"
 #include "library/librarymodel.h"
@@ -40,7 +42,6 @@ CddaDevice::CddaDevice(const QUrl& url, DeviceLister* lister,
           SLOT(SongsLoaded(SongList)));
   connect(this, SIGNAL(SongsDiscovered(SongList)), model_,
           SLOT(SongsDiscovered(SongList)));
-  //   connect(&cd_device_, SIGNAL(DiscChanged()), SLOT(DiscChangeDetected()));
   cdio_ = cdio_open(url_.path().toLocal8Bit().constData(), DRIVER_DEVICE);
   if (!cdio_) {
     throw DeviceError(url.toString(),
diff --git a/src/devices/cddadevice.h b/src/devices/cddadevice.h
index ad809a0d0..faf9d46f4 100644
--- a/src/devices/cddadevice.h
+++ b/src/devices/cddadevice.h
@@ -19,7 +19,6 @@
 #define CDDADEVICE_H
 
 #include <QTimer>
-#include <QUrl>
 
 // These must come after Qt includes (issue 3247)
 #include <cdio/cdio.h>
@@ -28,6 +27,8 @@
 #include "connecteddevice.h"
 #include "core/song.h"
 
+class QUrl;
+
 class CddaDevice : public ConnectedDevice {
   Q_OBJECT
 
diff --git a/src/ripper/ripcddialog.h b/src/ripper/ripcddialog.h
index 08c38ae7d..81c753913 100644
--- a/src/ripper/ripcddialog.h
+++ b/src/ripper/ripcddialog.h
@@ -20,11 +20,9 @@
 #define SRC_RIPPER_RIPCDDIALOG_H_
 
 #include <QDialog>
-#include <QFile>
 #include <memory>
 
 #include "core/song.h"
-#include "core/tagreaderclient.h"
 
 class QCheckBox;
 class QCloseEvent;