diff --git a/libraries/AP_Mount/AP_Mount.cpp b/libraries/AP_Mount/AP_Mount.cpp
index 884621832b..818b76ed9d 100644
--- a/libraries/AP_Mount/AP_Mount.cpp
+++ b/libraries/AP_Mount/AP_Mount.cpp
@@ -12,6 +12,7 @@
 #include "AP_Mount_SToRM32_serial.h"
 #include "AP_Mount_Gremsy.h"
 #include <AP_Math/location.h>
+#include <SRV_Channel/SRV_Channel.h>
 
 const AP_Param::GroupInfo AP_Mount::var_info[] = {
 
@@ -449,7 +450,7 @@ void AP_Mount::init()
 #endif
 
 #if HAL_SOLO_GIMBAL_ENABLED
-        // check for MAVLink mounts
+        // check for Solo mounts
         } else if (mount_type == Mount_Type_SoloGimbal) {
             _backends[instance] = new AP_Mount_SoloGimbal(*this, state[instance], instance);
             _num_instances++;
diff --git a/libraries/AP_Mount/AP_Mount_Backend.h b/libraries/AP_Mount/AP_Mount_Backend.h
index af09f3e281..db279e4dd2 100644
--- a/libraries/AP_Mount/AP_Mount_Backend.h
+++ b/libraries/AP_Mount/AP_Mount_Backend.h
@@ -19,9 +19,9 @@
  */
 #pragma once
 
-#include <AP_Common/AP_Common.h>
 #include "AP_Mount.h"
 #if HAL_MOUNT_ENABLED
+#include <AP_Common/AP_Common.h>
 #include <RC_Channel/RC_Channel.h>
 
 class AP_Mount_Backend