diff --git a/libraries/AP_Mount/AP_Mount_Backend.h b/libraries/AP_Mount/AP_Mount_Backend.h
index 066f7dd7e4..63e400b898 100644
--- a/libraries/AP_Mount/AP_Mount_Backend.h
+++ b/libraries/AP_Mount/AP_Mount_Backend.h
@@ -19,16 +19,22 @@
  */
 #pragma once
 
-#include "AP_Mount.h"
+#include "AP_Mount_config.h"
+
 #if HAL_MOUNT_ENABLED
+
+#include <GCS_MAVLink/GCS_MAVLink.h>
 #include <AP_Common/AP_Common.h>
+#include <AP_Common/Location.h>
 #include <RC_Channel/RC_Channel.h>
+#include <AP_Camera/AP_Camera_shareddefs.h>
+#include "AP_Mount_Params.h"
 
 class AP_Mount_Backend
 {
 public:
     // Constructor
-    AP_Mount_Backend(AP_Mount &frontend, AP_Mount_Params &params, uint8_t instance) :
+    AP_Mount_Backend(class AP_Mount &frontend, class AP_Mount_Params &params, uint8_t instance) :
         _frontend(frontend),
         _params(params),
         _instance(instance)
diff --git a/libraries/AP_Mount/SoloGimbal.h b/libraries/AP_Mount/SoloGimbal.h
index 236fe2a33a..1e29e0e474 100644
--- a/libraries/AP_Mount/SoloGimbal.h
+++ b/libraries/AP_Mount/SoloGimbal.h
@@ -6,16 +6,18 @@
 ************************************************************/
 #pragma once
 
-#include <AP_HAL/AP_HAL_Boards.h>
-#include "AP_Mount.h"
+#include "AP_Mount_config.h"
+
 #if HAL_SOLO_GIMBAL_ENABLED
-#include "SoloGimbalEKF.h"
-#include <AP_Math/AP_Math.h>
-#include <AP_Common/AP_Common.h>
-#include <GCS_MAVLink/GCS_MAVLink.h>
+
 #include <AP_AccelCal/AP_AccelCal.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL_Boards.h>
+#include <AP_Math/AP_Math.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
 
 #include "SoloGimbal_Parameters.h"
+#include "SoloGimbalEKF.h"
 
 enum gimbal_state_t {
     GIMBAL_STATE_NOT_PRESENT = 0,
diff --git a/libraries/AP_Mount/SoloGimbalEKF.h b/libraries/AP_Mount/SoloGimbalEKF.h
index 05a93d856d..04012db66f 100644
--- a/libraries/AP_Mount/SoloGimbalEKF.h
+++ b/libraries/AP_Mount/SoloGimbalEKF.h
@@ -18,11 +18,12 @@
  */
 #pragma once
 
+#include "AP_Mount_config.h"
+
+#if HAL_SOLO_GIMBAL_ENABLED
+
 #include <AP_Math/AP_Math.h>
 #include <AP_Param/AP_Param.h>
-//#include <AP_NavEKF2/AP_NavEKF2.h>
-#include "AP_Mount.h"
-#if HAL_SOLO_GIMBAL_ENABLED
 #include <AP_Math/vectorN.h>
 
 class SoloGimbalEKF
diff --git a/libraries/AP_Mount/SoloGimbal_Parameters.h b/libraries/AP_Mount/SoloGimbal_Parameters.h
index f46a87b4a7..c94342f757 100644
--- a/libraries/AP_Mount/SoloGimbal_Parameters.h
+++ b/libraries/AP_Mount/SoloGimbal_Parameters.h
@@ -1,9 +1,12 @@
 #pragma once
+
+#include "AP_Mount_config.h"
+
+#if HAL_SOLO_GIMBAL_ENABLED
+
 #include <AP_Math/AP_Math.h>
 #include <AP_Common/AP_Common.h>
 #include <GCS_MAVLink/GCS_MAVLink.h>
-#include "AP_Mount.h"
-#if HAL_SOLO_GIMBAL_ENABLED
 
 enum gmb_param_state_t {
     GMB_PARAMSTATE_NOT_YET_READ=0, // parameter has yet to be initialized
@@ -91,4 +94,4 @@ private:
     mavlink_channel_t _chan;
 };
 
-#endif // HAL_SOLO_GIMBAL_ENABLED
\ No newline at end of file
+#endif // HAL_SOLO_GIMBAL_ENABLED