diff --git a/src/main.c b/src/main.c
index c3bbbde955..715fbfebc3 100755
--- a/src/main.c
+++ b/src/main.c
@@ -3,6 +3,8 @@
 #include "mw.h"
 
 #include "rx_sbus.h"
+#include "rx_sumd.h"
+#include "rx_spektrum.h"
 #include "rx_common.h"
 #include "telemetry_common.h"
 #include "boardalignment.h"
diff --git a/src/mw.c b/src/mw.c
index b22e8ff4e5..dfc618ba48 100755
--- a/src/mw.c
+++ b/src/mw.c
@@ -9,6 +9,8 @@
 #include "typeconversion.h"
 #include "rx_common.h"
 #include "rx_sbus.h"
+#include "rx_sumd.h"
+#include "rx_spektrum.h"
 #include "failsafe.h"
 
 // June 2013     V2.2-dev
diff --git a/src/mw.h b/src/mw.h
index 41a78a8f2f..0415199211 100755
--- a/src/mw.h
+++ b/src/mw.h
@@ -73,7 +73,6 @@ enum {
 
 extern int16_t axisPID[3];
 extern int16_t rcCommand[4];
-extern int16_t failsafeCnt;
 
 extern int16_t debug[4];
 extern uint16_t acc_1G;
diff --git a/src/rx_sbus.c b/src/rx_sbus.c
index c67dcd45e1..c6af7d9d60 100644
--- a/src/rx_sbus.c
+++ b/src/rx_sbus.c
@@ -9,6 +9,8 @@
 #include "drivers/serial_uart.h"
 #include "runtime_config.h"
 
+#include "failsafe.h"
+
 #include "rx_common.h"
 #include "rx_sbus.h"
 
@@ -23,9 +25,6 @@ static bool sbusFrameDone = false;
 static void sbusDataReceive(uint16_t c);
 static uint16_t sbusReadRawRC(rxConfig_t *rxConfig, uint8_t chan);
 
-// external vars (ugh)
-extern int16_t failsafeCnt;
-
 static uint32_t sbusChannelData[SBUS_MAX_CHANNEL];
 
 //rxConfig_t *rxConfig;
diff --git a/src/rx_spektrum.c b/src/rx_spektrum.c
index e70bbae336..550275d2f9 100644
--- a/src/rx_spektrum.c
+++ b/src/rx_spektrum.c
@@ -9,6 +9,8 @@
 #include "drivers/serial_uart.h"
 #include "runtime_config.h"
 
+#include "failsafe.h"
+
 #include "rx_common.h"
 #include "rx_spektrum.h"
 
@@ -29,9 +31,6 @@ volatile uint8_t spekFrame[SPEK_FRAME_SIZE];
 static void spektrumDataReceive(uint16_t c);
 static uint16_t spektrumReadRawRC(rxConfig_t *rxConfig, uint8_t chan);
 
-// external vars (ugh)
-extern int16_t failsafeCnt;
-
 void spektrumInit(rxConfig_t *rxConfig, rcReadRawDataPtr *callback)
 {
     switch (rxConfig->serialrx_type) {