diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc
index d1e09d1dbf90c27388417c2e9dd7172f4b3d5693..5ac09a2c734b2d51aee7fa6994426b95cbe2d239 100644
--- a/src/comm/SerialLink.cc
+++ b/src/comm/SerialLink.cc
@@ -12,8 +12,8 @@
 #include <QDebug>
 #include <QSettings>
 #include <QMutexLocker>
-#include <qserialport.h>
-#include <qserialportinfo.h>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 #include "SerialLink.h"
 #include "LinkManager.h"
 #include "QGC.h"
@@ -771,7 +771,7 @@ bool SerialLink::setPortName(QString portName)
 bool SerialLink::setBaudRateType(int rateIndex)
 {
 
-  // These minimum and maximum baud rates were based on those enumerated in qserialport.h
+  // These minimum and maximum baud rates were based on those enumerated in <QSerialPort>
     bool result;
     const int minBaud = (int)QSerialPort::Baud1200;
     const int maxBaud = (int)QSerialPort::Baud115200;
diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h
index 5e96b71df3f4cc1983dd837c1807e1bf300023fe..90d155f1745f05c3a61cff2e7ba3b631a3400755 100644
--- a/src/comm/SerialLink.h
+++ b/src/comm/SerialLink.h
@@ -40,7 +40,7 @@ This file is part of the QGROUNDCONTROL project
 #include "SerialLinkInterface.h"
 
 // We use QSerialPort::SerialPortError in a signal so we must declare it as a meta type
-#include <qserialport.h>
+#include <QSerialPort>
 #include <QMetaType>
 Q_DECLARE_METATYPE(QSerialPort::SerialPortError)
 
diff --git a/src/ui/configuration/ApmFirmwareConfig.cc b/src/ui/configuration/ApmFirmwareConfig.cc
index 0468b24d178a9fc14a163abd7e4d4d23e4f94c60..a79e4dfcb986fe75b052609e813cf6381cd32ed0 100644
--- a/src/ui/configuration/ApmFirmwareConfig.cc
+++ b/src/ui/configuration/ApmFirmwareConfig.cc
@@ -2,8 +2,8 @@
 
 #include "LinkManager.h"
 #include "LinkInterface.h"
-#include "qserialport.h"
-#include "qserialportinfo.h"
+#include <QSerialPort>
+#include <QSerialPortInfo>
 #include "SerialLink.h"
 
 #include "ApmFirmwareConfig.h"
diff --git a/src/ui/configuration/ApmFirmwareConfig.h b/src/ui/configuration/ApmFirmwareConfig.h
index 07c1fa9b15a8553e1ea2fadf85b091ec55d3416b..37e7bf40f2cd781ebb50c26999fa175b9dfd5f3c 100644
--- a/src/ui/configuration/ApmFirmwareConfig.h
+++ b/src/ui/configuration/ApmFirmwareConfig.h
@@ -12,8 +12,8 @@
 #include <QMessageBox>
 #include <QProcess>
 #include <QScrollBar>
+#include <QSerialPort>
 
-#include "qserialport.h"
 #include "ui_ApmFirmwareConfig.h"
 
 class ApmFirmwareConfig : public QWidget
diff --git a/src/ui/configuration/SerialSettingsDialog.cc b/src/ui/configuration/SerialSettingsDialog.cc
index fbb8d2da60eb93687ba0c3a0c73a4297f7d32246..8056afdcc7a9d439d6d15768c5704f6c0e0acb66 100644
--- a/src/ui/configuration/SerialSettingsDialog.cc
+++ b/src/ui/configuration/SerialSettingsDialog.cc
@@ -37,8 +37,8 @@ This file is part of the APM_PLANNER project
 #include "terminalconsole.h"
 #include "ui_SerialSettingsDialog.h"
 
-#include <qserialport.h>
-#include <qserialportinfo.h>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 #include <QIntValidator>
 #include <QLineEdit>
 
diff --git a/src/ui/configuration/SerialSettingsDialog.h b/src/ui/configuration/SerialSettingsDialog.h
index 5b1586fdf2ffe3f55830639a3e8b8f556209a513..a52358ae0d661c759180f2108419078caeddda75 100644
--- a/src/ui/configuration/SerialSettingsDialog.h
+++ b/src/ui/configuration/SerialSettingsDialog.h
@@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-#include <qserialport.h>
+#include <QSerialPort>
 
 namespace Ui {
 class SettingsDialog;
diff --git a/src/ui/configuration/terminalconsole.cpp b/src/ui/configuration/terminalconsole.cpp
index 72e929f928989ffe9d42283e68d83eee225081fb..f0b1127f43bcda1f25f9d506a283a0805970f196 100644
--- a/src/ui/configuration/terminalconsole.cpp
+++ b/src/ui/configuration/terminalconsole.cpp
@@ -45,8 +45,8 @@ This file is part of the APM_PLANNER project
 #include <QMessageBox>
 #include <QVBoxLayout>
 #include <QComboBox>
-#include <qserialportinfo.h>
-#include <qserialport.h>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 
 TerminalConsole::TerminalConsole(QWidget *parent) :
     QWidget(parent),
diff --git a/src/ui/configuration/terminalconsole.h b/src/ui/configuration/terminalconsole.h
index 85a5643946c001a1ea2929c72a3078d501aae419..cb547e292243ef83b30f4779e313280738ff4117 100644
--- a/src/ui/configuration/terminalconsole.h
+++ b/src/ui/configuration/terminalconsole.h
@@ -39,7 +39,7 @@ This file is part of the APM_PLANNER project
 #include "SerialSettingsDialog.h"
 
 #include <QWidget>
-#include <qserialport.h>
+#include <QSerialPort>
 
 namespace Ui {
 class TerminalConsole;