diff --git a/libs/thirdParty/qserialport/src/common/qserialport.cpp b/libs/thirdParty/qserialport/src/common/qserialport.cpp
index 85b23eb77b5d8cdbc4b925b2033960903165da6a..be0c062231919d09ef823c57d39cfcfb4e2baeb5 100644
--- a/libs/thirdParty/qserialport/src/common/qserialport.cpp
+++ b/libs/thirdParty/qserialport/src/common/qserialport.cpp
@@ -27,7 +27,7 @@
 # include <fcntl.h>
 # include <sys/ioctl.h>
 # include <errno.h>
-# include "posix/termioshelper.h"
+# include "../posix/termioshelper.h"
 #elif defined(TNX_WINDOWS_SERIAL_PORT)
 # include "win32/commdcbhelper.h"
 # include "win32/qwincommevtnotifier.h"
diff --git a/src/comm/QGCMAVLink.h b/src/comm/QGCMAVLink.h
index bd58a506fafefa8a5b7fa359a5b9fdbcdaa47d0a..b9808ddaf5dadbb6a0592a02c7cf1e0575bbbae5 100644
--- a/src/comm/QGCMAVLink.h
+++ b/src/comm/QGCMAVLink.h
@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef QGCMAVLINK_H
 #define QGCMAVLINK_H
 
-#include <../../mavlink/include/mavlink/v1.0/common/mavlink.h>
+#include <mavlink.h>
 
 //#ifdef MAVLINK_CONF
 //#define MY_MACRO(x) <x>
diff --git a/src/uas/SlugsMAV.h b/src/uas/SlugsMAV.h
index 510c59a7d464b0fce8854d46f975db47cf67dc08..d3e7ae8c79478f71ecd68aa5a3ffc52340c1bff7 100644
--- a/src/uas/SlugsMAV.h
+++ b/src/uas/SlugsMAV.h
@@ -25,7 +25,7 @@ This file is part of the QGROUNDCONTROL project
 #define SLUGSMAV_H
 
 #include "UAS.h"
-#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "mavlink.h"
 #include <QTimer>
 
 #define SLUGS_UPDATE_RATE   200   // in ms
diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc
index 0e49f24c8bf189b813decbe46f6e86b0cac64ebf..5462cf9a3e4d8f5ecf9936f117261b03a1a34971 100644
--- a/src/uas/UASWaypointManager.cc
+++ b/src/uas/UASWaypointManager.cc
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 
 #include "UASWaypointManager.h"
 #include "UAS.h"
-#include "../../mavlink/include/mavlink/v1.0/mavlink_types.h"
+#include "mavlink_types.h"
 
 #define PROTOCOL_TIMEOUT_MS 2000    ///< maximum time to wait for pending messages until timeout
 #define PROTOCOL_DELAY_MS 20        ///< minimum delay between sent messages
diff --git a/src/uas/senseSoarMAV.h b/src/uas/senseSoarMAV.h
index 01930d370ca62f1d6ddb6aba2e87144b62e85783..faf9013c1aafc0e6c35a86fd3be49df3a369fe16 100644
--- a/src/uas/senseSoarMAV.h
+++ b/src/uas/senseSoarMAV.h
@@ -4,7 +4,7 @@
 
 
 #include "UAS.h"
-#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "mavlink.h"
 #include <QTimer>
 
 
diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc
index c9de5b42cf72428aee2a2d405e65bc9958d079e9..b8ccb9d407ec2d852ef028a7ef16ac478ddf67ba 100644
--- a/src/ui/DebugConsole.cc
+++ b/src/ui/DebugConsole.cc
@@ -35,7 +35,7 @@ This file is part of the QGROUNDCONTROL project
 #include "ui_DebugConsole.h"
 #include "LinkManager.h"
 #include "UASManager.h"
-#include "../../mavlink/include/mavlink/v1.0/protocol.h"
+#include "protocol.h"
 #include "QGC.h"
 
 #include <QDebug>
diff --git a/src/ui/SlugsDataSensorView.h b/src/ui/SlugsDataSensorView.h
index 999b0b814db2c3074728c9f7065c4bf4e25492ed..628f6e29c756c43ca885155e4cbca6b752a451db 100644
--- a/src/ui/SlugsDataSensorView.h
+++ b/src/ui/SlugsDataSensorView.h
@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 
 #include "UASInterface.h"
 #include "SlugsMAV.h"
-#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "mavlink.h"
 
 
 namespace Ui