diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.cpp b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
index d88ca94cb3..37a32d7ddc 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
@@ -11,7 +11,7 @@ License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) any later version.
 */
 
-#include <FastSerial.h>
+#include <AP_HAL.h>
 #include <AP_Common.h>
 #include <GCS_MAVLink.h>
 
@@ -20,8 +20,8 @@ version 2.1 of the License, or (at your option) any later version.
 #endif
 
 
-BetterStream	*mavlink_comm_0_port;
-BetterStream	*mavlink_comm_1_port;
+AP_HAL::BetterStream	*mavlink_comm_0_port;
+AP_HAL::BetterStream	*mavlink_comm_1_port;
 
 mavlink_system_t mavlink_system = {7,1,0,0};
 
diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h
index 1dfdd83043..a959467682 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.h
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.h
@@ -6,8 +6,8 @@
 #ifndef GCS_MAVLink_h
 #define GCS_MAVLink_h
 
+#include <AP_HAL.h>
 #include <AP_Param.h>
-#include <BetterStream.h>
 
 // we have separate helpers disabled to make it possible
 // to select MAVLink 1.0 in the arduino GUI build
@@ -24,10 +24,10 @@
 #include "include/mavlink/v1.0/mavlink_types.h"
 
 /// MAVLink stream used for HIL interaction
-extern BetterStream	*mavlink_comm_0_port;
+extern AP_HAL::BetterStream	*mavlink_comm_0_port;
 
 /// MAVLink stream used for ground control communication
-extern BetterStream	*mavlink_comm_1_port;
+extern AP_HAL::BetterStream	*mavlink_comm_1_port;
 
 /// MAVLink system definition
 extern mavlink_system_t mavlink_system;