diff --git a/src/DownloadRideDialog.cpp b/src/DownloadRideDialog.cpp
index 6f841cb75..6bde790ee 100644
--- a/src/DownloadRideDialog.cpp
+++ b/src/DownloadRideDialog.cpp
@@ -20,11 +20,11 @@
 
 #include "DownloadRideDialog.h"
 #include "MainWindow.h"
+#include "PowerTapDevice.h"
+#include "PowerTapUtil.h"
 #include <assert.h>
-#include <string.h>
 #include <errno.h>
 #include <QtGui>
-#include <math.h>
 #include <boost/bind.hpp>
 
 DownloadRideDialog::DownloadRideDialog(MainWindow *mainWindow,
diff --git a/src/DownloadRideDialog.h b/src/DownloadRideDialog.h
index 56bc9b0af..1bb940d5e 100644
--- a/src/DownloadRideDialog.h
+++ b/src/DownloadRideDialog.h
@@ -19,12 +19,10 @@
 #ifndef _GC_DownloadRideDialog_h
 #define _GC_DownloadRideDialog_h 1
 
+#include "CommPort.h"
 #include <QtGui>
-#include "PowerTapDevice.h"
-#include "PowerTapUtil.h"
 
 class MainWindow;
-class DownloadThread;
 
 class DownloadRideDialog : public QDialog 
 {