From 143f2d6651cbe9f5a457b514f088f90c8caa1a99 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Wed, 28 Dec 2016 19:36:03 +0000
Subject: [PATCH] Include file fixups

---
 src/main/cms/cms_menu_blackbox.c       |  2 ++
 src/main/cms/cms_menu_imu.c            |  4 ++--
 src/main/cms/cms_menu_vtx.c            |  2 ++
 src/main/drivers/max7456.h             |  3 ++-
 src/main/drivers/rx_pwm.c              |  2 +-
 src/main/fc/config.c                   | 19 ++++++++++---------
 src/main/rx/pwm.c                      |  6 +++---
 src/main/rx/rx.c                       |  1 +
 src/main/target/ALIENFLIGHTF3/config.c |  3 ++-
 src/main/target/BLUEJAYF4/config.c     |  4 +++-
 src/main/target/NAZE/config.c          |  4 ++++
 11 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c
index 89616458a2..9998ff6197 100644
--- a/src/main/cms/cms_menu_blackbox.c
+++ b/src/main/cms/cms_menu_blackbox.c
@@ -36,6 +36,8 @@
 #include "cms/cms_types.h"
 #include "cms/cms_menu_blackbox.h"
 
+#include "common/utils.h"
+
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c
index df316179fc..f95560a2cd 100644
--- a/src/main/cms/cms_menu_imu.c
+++ b/src/main/cms/cms_menu_imu.c
@@ -31,12 +31,12 @@
 
 #include "drivers/system.h"
 
-//#include "common/typeconversion.h"
-
 #include "cms/cms.h"
 #include "cms/cms_types.h"
 #include "cms/cms_menu_imu.h"
 
+#include "common/utils.h"
+
 #include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/cms/cms_menu_vtx.c b/src/main/cms/cms_menu_vtx.c
index 8d803fa951..abbb488f5c 100644
--- a/src/main/cms/cms_menu_vtx.c
+++ b/src/main/cms/cms_menu_vtx.c
@@ -27,6 +27,8 @@
 #include "cms/cms_types.h"
 #include "cms/cms_menu_vtx.h"
 
+#include "common/utils.h"
+
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/drivers/max7456.h b/src/main/drivers/max7456.h
index 6c91f58ab8..3b7eb066b9 100755
--- a/src/main/drivers/max7456.h
+++ b/src/main/drivers/max7456.h
@@ -34,7 +34,8 @@
 
 extern uint16_t maxScreenSize;
 
-void    max7456Init(const vcdProfile_t *vcdProfile);
+struct vcdProfile_s;
+void    max7456Init(const struct vcdProfile_s *vcdProfile);
 void    max7456DrawScreen(void);
 void    max7456WriteNvm(uint8_t char_address, const uint8_t *font_data);
 uint8_t max7456GetRowsCount(void);
diff --git a/src/main/drivers/rx_pwm.c b/src/main/drivers/rx_pwm.c
index a745fd0733..cf37e764ce 100644
--- a/src/main/drivers/rx_pwm.c
+++ b/src/main/drivers/rx_pwm.c
@@ -34,7 +34,7 @@
 #include "timer.h"
 
 #include "pwm_output.h"
-#include "pwm_rx.h"
+#include "rx_pwm.h"
 
 #define DEBUG_PPM_ISR
 
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 090403058f..98f95aee4f 100755
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -36,18 +36,19 @@
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
-#include "drivers/system.h"
-#include "drivers/timer.h"
-#include "drivers/rx_pwm.h"
-#include "drivers/rx_spi.h"
-#include "drivers/serial.h"
+#include "drivers/io.h"
+#include "drivers/light_ws2811strip.h"
+#include "drivers/max7456.h"
 #include "drivers/pwm_esc_detect.h"
 #include "drivers/pwm_output.h"
-#include "drivers/vcd.h"
-#include "drivers/max7456.h"
-#include "drivers/sound_beeper.h"
-#include "drivers/light_ws2811strip.h"
+#include "drivers/rx_pwm.h"
+#include "drivers/rx_spi.h"
 #include "drivers/sdcard.h"
+#include "drivers/serial.h"
+#include "drivers/sound_beeper.h"
+#include "drivers/system.h"
+#include "drivers/timer.h"
+#include "drivers/vcd.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c
index f41ce38df9..d7b1d5c50a 100644
--- a/src/main/rx/pwm.c
+++ b/src/main/rx/pwm.c
@@ -25,14 +25,14 @@
 
 #if defined(USE_PWM) || defined(USE_PPM)
 
-#include "build/build_config.h"
-
 #include "drivers/rx_pwm.h"
 
-#include "fc/config.h"
+#include "common/utils.h"
 
 #include "config/feature.h"
 
+#include "fc/config.h"
+
 #include "rx/rx.h"
 #include "rx/pwm.h"
 
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 6a8278b19a..aef4ea7b92 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -27,6 +27,7 @@
 #include "build/debug.h"
 
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "config/feature.h"
 
diff --git a/src/main/target/ALIENFLIGHTF3/config.c b/src/main/target/ALIENFLIGHTF3/config.c
index 135104b09e..e87e13c03a 100644
--- a/src/main/target/ALIENFLIGHTF3/config.c
+++ b/src/main/target/ALIENFLIGHTF3/config.c
@@ -22,10 +22,11 @@
 
 #include "common/axis.h"
 
-#include "drivers/sensor.h"
 #include "drivers/compass.h"
+#include "drivers/io.h"
 #include "drivers/pwm_esc_detect.h"
 #include "drivers/pwm_output.h"
+#include "drivers/sensor.h"
 
 #include "fc/rc_controls.h"
 
diff --git a/src/main/target/BLUEJAYF4/config.c b/src/main/target/BLUEJAYF4/config.c
index fc2fcaaf65..3ea9d9f7de 100644
--- a/src/main/target/BLUEJAYF4/config.c
+++ b/src/main/target/BLUEJAYF4/config.c
@@ -20,10 +20,12 @@
 
 #include <platform.h>
 
+#include "blackbox/blackbox_io.h"
+
 #include "config/config_master.h"
 #include "config/feature.h"
 
-#include "blackbox/blackbox_io.h"
+#include "drivers/io.h"
 
 #include "hardware_revision.h"
 
diff --git a/src/main/target/NAZE/config.c b/src/main/target/NAZE/config.c
index 6e8e07591f..e9e1126747 100755
--- a/src/main/target/NAZE/config.c
+++ b/src/main/target/NAZE/config.c
@@ -20,6 +20,10 @@
 
 #include <platform.h>
 
+#include "common/utils.h"
+
+#include "drivers/io.h"
+
 #include "fc/rc_controls.h"
 
 #include "flight/failsafe.h"