From 84269be8a27f09be0ca45d85de78e3dd582d33c6 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Sun, 12 Nov 2017 14:29:01 +0000
Subject: [PATCH] Tidied header files

---
 src/main/interface/settings.c   | 5 -----
 src/main/rx/crsf.c              | 2 --
 src/main/telemetry/crsf.h       | 4 +++-
 src/main/telemetry/msp_shared.c | 5 -----
 src/main/telemetry/msp_shared.h | 7 ++++---
 src/main/telemetry/smartport.h  | 8 +++++---
 6 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index d0cafaf14..ce6bc2c45 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -17,11 +17,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 
 #include "platform.h"
 
diff --git a/src/main/rx/crsf.c b/src/main/rx/crsf.c
index f2df7aeb9..6aa24c0f2 100644
--- a/src/main/rx/crsf.c
+++ b/src/main/rx/crsf.c
@@ -38,8 +38,6 @@
 
 #include "io/serial.h"
 
-#include "msp/msp.h"
-
 #include "rx/rx.h"
 #include "rx/crsf.h"
 
diff --git a/src/main/telemetry/crsf.h b/src/main/telemetry/crsf.h
index e8fe4ae44..01712be54 100644
--- a/src/main/telemetry/crsf.h
+++ b/src/main/telemetry/crsf.h
@@ -17,9 +17,11 @@
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "common/time.h"
 #include "rx/crsf.h"
-#include "telemetry/msp_shared.h"
 
 void initCrsfTelemetry(void);
 bool checkCrsfTelemetryState(void);
diff --git a/src/main/telemetry/msp_shared.c b/src/main/telemetry/msp_shared.c
index d0bb1fd91..67bcb842f 100644
--- a/src/main/telemetry/msp_shared.c
+++ b/src/main/telemetry/msp_shared.c
@@ -1,7 +1,5 @@
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
 #include <string.h>
 
 #include "platform.h"
@@ -14,10 +12,7 @@
 
 #include "interface/fc_msp.h"
 
-#include "msp/msp.h"
-
 #include "rx/crsf.h"
-#include "rx/msp.h"
 
 #include "telemetry/msp_shared.h"
 #include "telemetry/smartport.h"
diff --git a/src/main/telemetry/msp_shared.h b/src/main/telemetry/msp_shared.h
index ba2fd7b7b..c4c23b023 100644
--- a/src/main/telemetry/msp_shared.h
+++ b/src/main/telemetry/msp_shared.h
@@ -1,17 +1,18 @@
 #pragma once
 
-#include "msp/msp.h"
+#include "common/streambuf.h"
 #include "rx/crsf.h"
 #include "telemetry/smartport.h"
 
 typedef void (*mspResponseFnPtr)(uint8_t *payload);
 
+struct mspPacket_s;
 typedef struct mspPackage_s {
     sbuf_t requestFrame;
     uint8_t *requestBuffer;
     uint8_t *responseBuffer;
-    mspPacket_t *requestPacket;
-    mspPacket_t *responsePacket;
+    struct mspPacket_s *requestPacket;
+    struct mspPacket_s *responsePacket;
 } mspPackage_t;
 
 typedef union mspRxBuffer_u {
diff --git a/src/main/telemetry/smartport.h b/src/main/telemetry/smartport.h
index c6e728b66..0b258efeb 100644
--- a/src/main/telemetry/smartport.h
+++ b/src/main/telemetry/smartport.h
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "drivers/serial.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 #define SMARTPORT_MSP_TX_BUF_SIZE 256
 #define SMARTPORT_MSP_RX_BUF_SIZE 64
@@ -27,5 +28,6 @@ bool initSmartPortTelemetryExternal(smartPortWriteFrameFn *smartPortWriteFrameEx
 void handleSmartPortTelemetry(void);
 void processSmartPortTelemetry(smartPortPayload_t *payload, volatile bool *hasRequest, const uint32_t *requestTimeout);
 
-void smartPortWriteFrameSerial(const smartPortPayload_t *payload, serialPort_t *port, uint16_t checksum);
-void smartPortSendByte(uint8_t c, uint16_t *checksum, serialPort_t *port);
+struct serialPort_s;
+void smartPortWriteFrameSerial(const smartPortPayload_t *payload, struct serialPort_s *port, uint16_t checksum);
+void smartPortSendByte(uint8_t c, uint16_t *checksum, struct serialPort_s *port);