diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 46942b65a9ed66fc91dbd298a9d5dd4033601fa0..9625c8779fd97bb7de0af3b522a1653de3baca81 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -75,6 +75,7 @@ DEPENDPATH += . \
     plugins
 INCLUDEPATH += . \
     lib/QMapControl \
+    $$BASEDIR/../mavlink/include \
     $$BASEDIR/../mavlink/include/common
 
 # ../mavlink/include \
@@ -201,7 +202,7 @@ HEADERS += src/MG.h \
     src/ui/map3D/WebImage.h \
     src/ui/map3D/WebImageCache.h \
     src/ui/map3D/Imagery.h \
-    src/comm/QGCMAVlink.h
+    src/comm/QGCMAVLink.h
 SOURCES += src/main.cc \
     src/Core.cc \
     src/uas/UASManager.cc \
diff --git a/src/comm/MAVLinkProtocol.h b/src/comm/MAVLinkProtocol.h
index b885cdedfade4789093da23f141ec39c89db7dcd..d3e436d34b6005f8adb19c3b48a4c8a27f6f9d5c 100644
--- a/src/comm/MAVLinkProtocol.h
+++ b/src/comm/MAVLinkProtocol.h
@@ -39,8 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QByteArray>
 #include "ProtocolInterface.h"
 #include "LinkInterface.h"
-#include "protocol.h"
-#include "QGCMAVlink.h"
+#include "QGCMAVLink.h"
 
 /**
  * @brief MAVLink micro air vehicle protocol reference implementation.
diff --git a/src/comm/QGCMAVlink.h b/src/comm/QGCMAVLink.h
similarity index 98%
rename from src/comm/QGCMAVlink.h
rename to src/comm/QGCMAVLink.h
index 171a6ebf6ff7a654cd9e23049fde766fce6bd060..4e0a5baa3772543fc51108791bb7a60aeaea4a2a 100644
--- a/src/comm/QGCMAVlink.h
+++ b/src/comm/QGCMAVLink.h
@@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #define QGCMAVLINK_H
 
 #include <mavlink_types.h>
+#include <mavlink.h>
 
 #ifdef QGC_USE_PIXHAWK_MESSAGES
 #include <pixhawk.h>