From 448885bfc5d2d1a7fa4864c7a444676741bc3c2c Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Sun, 17 Jun 2018 16:38:16 +1200
Subject: [PATCH] Fixed USB CDC includes.

---
 src/main/drivers/serial_usb_vcp.c     | 1 +
 src/main/drivers/serial_usb_vcp.h     | 2 ++
 src/main/vcp_hal/usbd_cdc_interface.c | 6 +++---
 src/main/vcp_hal/usbd_cdc_interface.h | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/drivers/serial_usb_vcp.c b/src/main/drivers/serial_usb_vcp.c
index 712e9a7c2..8e6bacb43 100644
--- a/src/main/drivers/serial_usb_vcp.c
+++ b/src/main/drivers/serial_usb_vcp.c
@@ -28,6 +28,7 @@
 #include "build/build_config.h"
 
 #include "common/utils.h"
+
 #include "drivers/io.h"
 
 #if defined(STM32F4)
diff --git a/src/main/drivers/serial_usb_vcp.h b/src/main/drivers/serial_usb_vcp.h
index 29b7096d2..18cfeb929 100644
--- a/src/main/drivers/serial_usb_vcp.h
+++ b/src/main/drivers/serial_usb_vcp.h
@@ -23,6 +23,8 @@
 #include "drivers/serial.h"
 
 #if defined(STM32F7)
+#include "common/maths.h"
+
 #include "usbd_cdc.h"
 
 extern USBD_HandleTypeDef  USBD_Device;
diff --git a/src/main/vcp_hal/usbd_cdc_interface.c b/src/main/vcp_hal/usbd_cdc_interface.c
index 5a4b3a6d4..4d3982188 100644
--- a/src/main/vcp_hal/usbd_cdc_interface.c
+++ b/src/main/vcp_hal/usbd_cdc_interface.c
@@ -46,6 +46,9 @@
   */
 
 /* Includes ------------------------------------------------------------------*/
+#include "drivers/serial_usb_vcp.h"
+#include "drivers/time.h"
+
 #include "stm32f7xx_hal.h"
 #include "usbd_core.h"
 #include "usbd_desc.h"
@@ -53,9 +56,6 @@
 #include "usbd_cdc_interface.h"
 #include "stdbool.h"
 
-#include "drivers/serial_usb_vcp.h"
-#include "drivers/time.h"
-
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 #define APP_RX_DATA_SIZE  2048
diff --git a/src/main/vcp_hal/usbd_cdc_interface.h b/src/main/vcp_hal/usbd_cdc_interface.h
index a4f3d8080..3674dc410 100644
--- a/src/main/vcp_hal/usbd_cdc_interface.h
+++ b/src/main/vcp_hal/usbd_cdc_interface.h
@@ -50,6 +50,8 @@
 #define __USBD_CDC_IF_H
 
 /* Includes ------------------------------------------------------------------*/
+#include "common/maths.h"
+
 #include "usbd_cdc.h"
 #include "stm32f7xx_hal.h"
 #include "usbd_core.h"