diff --git a/libraries/AP_Mount/AP_Mount.cpp b/libraries/AP_Mount/AP_Mount.cpp
index 93533671c3..f720d4ae10 100644
--- a/libraries/AP_Mount/AP_Mount.cpp
+++ b/libraries/AP_Mount/AP_Mount.cpp
@@ -386,7 +386,7 @@ const AP_Param::GroupInfo AP_Mount::var_info[] PROGMEM = {
     AP_GROUPEND
 };
 
-AP_Mount::AP_Mount(const AP_AHRS_MOUNT &ahrs, const struct Location &current_loc) :
+AP_Mount::AP_Mount(const AP_AHRS_TYPE &ahrs, const struct Location &current_loc) :
     _ahrs(ahrs),
     _current_loc(current_loc),
     _num_instances(0),
diff --git a/libraries/AP_Mount/AP_Mount.h b/libraries/AP_Mount/AP_Mount.h
index 4656f301db..338571ded6 100644
--- a/libraries/AP_Mount/AP_Mount.h
+++ b/libraries/AP_Mount/AP_Mount.h
@@ -44,11 +44,6 @@ class AP_Mount_SToRM32;
   This is a workaround to allow the MAVLink backend access to the
   SmallEKF. It would be nice to find a neater solution to this
  */
-#if AP_AHRS_NAVEKF_AVAILABLE
-#define AP_AHRS_MOUNT AP_AHRS_NavEKF
-#else
-#define AP_AHRS_MOUNT AP_AHRS
-#endif
 
 class AP_Mount
 {
@@ -71,7 +66,7 @@ public:
     };
 
     // Constructor
-    AP_Mount(const AP_AHRS_MOUNT &ahrs, const struct Location &current_loc);
+    AP_Mount(const AP_AHRS_TYPE &ahrs, const struct Location &current_loc);
 
     // init - detect and initialise all mounts
     void init(const AP_SerialManager& serial_manager);
@@ -128,7 +123,7 @@ public:
 protected:
 
     // private members
-    const AP_AHRS_MOUNT     &_ahrs;
+    const AP_AHRS_TYPE     &_ahrs;
     const struct Location   &_current_loc;  // reference to the vehicle's current location
 
     // frontend parameters