diff --git a/libraries/AP_Generator/AP_Generator.cpp b/libraries/AP_Generator/AP_Generator.cpp
index 78309a80e9..4c735d7c65 100644
--- a/libraries/AP_Generator/AP_Generator.cpp
+++ b/libraries/AP_Generator/AP_Generator.cpp
@@ -21,6 +21,8 @@
 #include "AP_Generator_IE_2400.h"
 #include "AP_Generator_RichenPower.h"
 
+#include <GCS_MAVLink/GCS.h>
+
 const AP_Param::GroupInfo AP_Generator::var_info[] = {
 
     // @Param: TYPE
diff --git a/libraries/AP_Generator/AP_Generator.h b/libraries/AP_Generator/AP_Generator.h
index 9e5a269e59..e4b44d4dd3 100644
--- a/libraries/AP_Generator/AP_Generator.h
+++ b/libraries/AP_Generator/AP_Generator.h
@@ -9,7 +9,6 @@
 #if HAL_GENERATOR_ENABLED
 
 #include <AP_Param/AP_Param.h>
-#include <GCS_MAVLink/GCS.h>
 #include <AP_BattMonitor/AP_BattMonitor.h>
 
 class AP_Generator_Backend;
@@ -62,7 +61,7 @@ public:
     bool idle(void);
     bool run(void);
 
-    void send_generator_status(const GCS_MAVLINK &channel);
+    void send_generator_status(const class GCS_MAVLINK &channel);
 
     // Parameter block
     static const struct AP_Param::GroupInfo var_info[];
diff --git a/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp b/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
index 24eb6605dd..b1dfddfdcf 100644
--- a/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
@@ -14,10 +14,12 @@
  */
 
 #include "AP_Generator_IE_FuelCell.h"
-#include <AP_SerialManager/AP_SerialManager.h>
 
 #if HAL_GENERATOR_ENABLED
 
+#include <AP_SerialManager/AP_SerialManager.h>
+#include <GCS_MAVLink/GCS.h>
+
 // Initialize the fuelcell object and prepare it for use
 void AP_Generator_IE_FuelCell::init()
 {
diff --git a/libraries/AP_Generator/AP_Generator_IE_FuelCell.h b/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
index 7ba662ec21..a1666adbe2 100644
--- a/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
+++ b/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
@@ -4,9 +4,6 @@
 
 #if HAL_GENERATOR_ENABLED
 
-#include <AP_Param/AP_Param.h>
-#include <GCS_MAVLink/GCS.h>
-
 class AP_Generator_IE_FuelCell : public AP_Generator_Backend
 {