diff --git a/libraries/AP_Mount/AP_Mount_SoloGimbal.cpp b/libraries/AP_Mount/AP_Mount_SoloGimbal.cpp
index b188f945a2f23..02c8c3f2475c1 100644
--- a/libraries/AP_Mount/AP_Mount_SoloGimbal.cpp
+++ b/libraries/AP_Mount/AP_Mount_SoloGimbal.cpp
@@ -1,6 +1,9 @@
-#include "AP_Mount_SoloGimbal.h"
+#include "AP_Mount_config.h"
+
 #if HAL_SOLO_GIMBAL_ENABLED
 
+#include "AP_Mount_SoloGimbal.h"
+
 #include "SoloGimbal.h"
 #include <AP_Logger/AP_Logger.h>
 #include <GCS_MAVLink/GCS_MAVLink.h>
diff --git a/libraries/AP_Mount/AP_Mount_SoloGimbal.h b/libraries/AP_Mount/AP_Mount_SoloGimbal.h
index 4e64233284a9f..ed32e6697bef6 100644
--- a/libraries/AP_Mount/AP_Mount_SoloGimbal.h
+++ b/libraries/AP_Mount/AP_Mount_SoloGimbal.h
@@ -3,18 +3,16 @@
  */
 #pragma once
 
+#include "AP_Mount_config.h"
 
-#include <AP_HAL/AP_HAL.h>
+#if HAL_SOLO_GIMBAL_ENABLED
 
 #include "AP_Mount_Backend.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 <RC_Channel/RC_Channel.h>
 #include "SoloGimbal.h"
 
-
 class AP_Mount_SoloGimbal : public AP_Mount_Backend
 {