Rover: include fix in mode.h

Co-authored-by: Peter Barker <pbarker@barker.dropbear.id.au>

Rover/Rover.h

@@ -19,6 +19,7 @@
 
 #include <cmath>
 #include <stdarg.h>
+#include <stdint.h>
 
 // Libraries
 #include <AP_Common/AP_Common.h>
@@ -37,18 +38,21 @@
 #include <AP_Logger/AP_Logger.h>
 #include <AP_OSD/AP_OSD.h>
 #include <AR_Motors/AP_MotorsUGV.h>
+#include <AP_Mission/AP_Mission.h>
+#include <AP_Mission/AP_Mission_ChangeDetector.h>
+#include <AR_WPNav/AR_WPNav_OA.h>
+
+// Configuration
+#include "defines.h"
+#include "config.h"
 
 #if AP_SCRIPTING_ENABLED
 #include <AP_Scripting/AP_Scripting.h>
 #endif
 
 // Local modules
-#include "mode.h"
 #include "AP_Arming.h"
 #include "sailboat.h"
-// Configuration
-#include "config.h"
-#include "defines.h"
 #if ADVANCED_FAILSAFE == ENABLED
 #include "afs_rover.h"
 #endif
@@ -58,6 +62,8 @@
 #include "AP_Rally.h"
 #include "RC_Channel.h"                  // RC Channel Library
 
+#include "mode.h"
+
 class Rover : public AP_Vehicle {
 public:
     friend class GCS_MAVLINK_Rover;

Rover/mode.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 Mode::Mode() :

Rover/mode.h

@@ -1,14 +1,6 @@
 #pragma once
 
-#include <stdint.h>
-
-#include <GCS_MAVLink/GCS_MAVLink.h>
-#include <AP_Math/AP_Math.h>
-#include <AP_Mission/AP_Mission.h>
-#include <AP_Mission/AP_Mission_ChangeDetector.h>
-#include <AR_WPNav/AR_WPNav_OA.h>
-
-#include "defines.h"
+#include "Rover.h"
 
 // pre-define ModeRTL so Auto can appear higher in this file
 class ModeRTL;

Rover/mode_acro.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 void ModeAcro::update()

Rover/mode_auto.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 #define AUTO_GUIDED_SEND_TARGET_MS 1000

Rover/mode_follow.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 // initialize follow mode

Rover/mode_guided.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 bool ModeGuided::_enter()

Rover/mode_hold.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 void ModeHold::update()

Rover/mode_loiter.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 bool ModeLoiter::_enter()

Rover/mode_manual.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 void ModeManual::_exit()

Rover/mode_rtl.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 bool ModeRTL::_enter()

Rover/mode_simple.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 void ModeSimple::init_heading()

Rover/mode_smart_rtl.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 bool ModeSmartRTL::_enter()

Rover/mode_steering.cpp

@@ -1,4 +1,3 @@
-#include "mode.h"
 #include "Rover.h"
 
 void ModeSteering::update()