diff --git a/lib/main/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h b/lib/main/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h
index f086ddc323..02c7f81dfc 100644
--- a/lib/main/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h
+++ b/lib/main/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h
@@ -82,7 +82,9 @@ typedef enum
                               (__DMA_HANDLE__).Parent = (__HANDLE__);             \
                           } while(0)
 
+#ifndef UNUSED
 #define UNUSED(x) ((void)(x))
+#endif
 
 /** @brief Reset the Handle's State field.
   * @param __HANDLE__: specifies the Peripheral Handle.
diff --git a/src/main/drivers/sdcard.c b/src/main/drivers/sdcard.c
index 9cb38bcc5e..cb8a70a918 100644
--- a/src/main/drivers/sdcard.c
+++ b/src/main/drivers/sdcard.c
@@ -22,6 +22,8 @@
 
 #ifdef USE_SDCARD
 
+#include "common/utils.h"
+
 #include "drivers/nvic.h"
 #include "drivers/io.h"
 #include "dma.h"
@@ -55,9 +57,6 @@
  */
 #define SDCARD_NON_DMA_CHUNK_SIZE 256
 
-#define STATIC_ASSERT(condition, name ) \
-    typedef char assert_failed_ ## name [(condition) ? 1 : -1 ]
-
 typedef enum {
     // In these states we run at the initialization 400kHz clockspeed:
     SDCARD_STATE_NOT_PRESENT = 0,
diff --git a/src/main/target/FALCORE/config.c b/src/main/target/FALCORE/config.c
index b23778427a..887c40dc61 100755
--- a/src/main/target/FALCORE/config.c
+++ b/src/main/target/FALCORE/config.c
@@ -23,6 +23,7 @@
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
+#include "fc/rc_modes.h"
 #include "io/serial.h"
 #include "rx/rx.h"
 #include "sensors/sensors.h"