AP_Mount: tidy includes

libraries/AP_Mount/AP_Mount.h

@@ -19,8 +19,7 @@
 ************************************************************/
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-#include <AP_AHRS/AP_AHRS.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #ifndef HAL_MOUNT_ENABLED
 #define HAL_MOUNT_ENABLED !HAL_MINIMIZE_FEATURES

libraries/AP_Mount/AP_Mount_Alexmos.cpp

@@ -2,6 +2,8 @@
 #if HAL_MOUNT_ENABLED
 #include <AP_SerialManager/AP_SerialManager.h>
 
+#include <AP_AHRS/AP_AHRS.h>
+
 extern const AP_HAL::HAL& hal;
 
 void AP_Mount_Alexmos::init()
@@ -305,4 +307,4 @@ void AP_Mount_Alexmos::read_incoming()
         }
     }
 }
-#endif // HAL_MOUNT_ENABLED
+#endif // HAL_MOUNT_ENABLED

libraries/AP_Mount/AP_Mount_Alexmos.h

@@ -8,7 +8,6 @@
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_Math/AP_Math.h>
-#include <AP_AHRS/AP_AHRS.h>
 #include "AP_Mount_Backend.h"
 
 

libraries/AP_Mount/AP_Mount_SToRM32.h

@@ -3,14 +3,14 @@
  */
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-#include <AP_AHRS/AP_AHRS.h>
+#include "AP_Mount_Backend.h"
+
+#if HAL_MOUNT_ENABLED
 
 #include <AP_Math/AP_Math.h>
 #include <AP_Common/AP_Common.h>
 #include <RC_Channel/RC_Channel.h>
-#include "AP_Mount_Backend.h"
-#if HAL_MOUNT_ENABLED
+#include <AP_AHRS/AP_AHRS.h>
 
 #define AP_MOUNT_STORM32_RESEND_MS  1000    // resend angle targets to gimbal once per second
 #define AP_MOUNT_STORM32_SEARCH_MS  60000   // search for gimbal for 1 minute after startup

libraries/AP_Mount/SoloGimbal.h

@@ -6,8 +6,7 @@
 ************************************************************/
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-#include <AP_AHRS/AP_AHRS.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Mount.h"
 #if HAL_SOLO_GIMBAL_ENABLED
 #include "SoloGimbalEKF.h"