diff --git a/code/espurna/ota.ino b/code/espurna/ota.ino
index d52844b8..42ca5b67 100644
--- a/code/espurna/ota.ino
+++ b/code/espurna/ota.ino
@@ -28,7 +28,7 @@ void _otaLoop() {
 // Terminal OTA
 // -----------------------------------------------------------------------------
 
-#if TERMINAL_SUPPORT
+#if TERMINAL_SUPPORT || OTA_MQTT_SUPPORT
 
 #include <ESPAsyncTCP.h>
 AsyncClient * _ota_client;
@@ -186,6 +186,11 @@ void _otaFrom(String url) {
 
 }
 
+#endif // TERMINAL_SUPPORT || OTA_MQTT_SUPPORT
+
+
+#if TERMINAL_SUPPORT
+
 void _otaInitCommands() {
 
     terminalRegisterCommand(F("OTA"), [](Embedis* e) {
diff --git a/code/espurna/rfbridge.ino b/code/espurna/rfbridge.ino
index 4e854503..7667ef7f 100644
--- a/code/espurna/rfbridge.ino
+++ b/code/espurna/rfbridge.ino
@@ -152,9 +152,6 @@ void _rfbLearn() {
 
 }
 
-
-#if not RF_SUPPORT
-
 /*
  From an hexa char array ("A220EE...") to a byte array (half the size)
  */
@@ -170,6 +167,8 @@ static int _rfbToArray(const char * in, byte * out, int length = RF_MESSAGE_SIZE
     return n;
 }
 
+#if not RF_SUPPORT
+
 void _rfbSendRaw(const byte *message, const unsigned char n = RF_MESSAGE_SIZE) {
     for (unsigned char j=0; j<n; j++) {
         Serial.write(message[j]);
@@ -556,6 +555,7 @@ void _rfbMqttCallback(unsigned int type, const char * topic, const char * payloa
 
 void _rfbAPISetup() {
 
+    #if not RF_SUPPORT
     apiRegister(MQTT_TOPIC_RFOUT,
         [](char * buffer, size_t len) {
             snprintf_P(buffer, len, PSTR("OK"));
@@ -564,6 +564,7 @@ void _rfbAPISetup() {
             _rfbParseCode((char *) payload);
         }
     );
+    #endif // RF_SUPPORT
 
     apiRegister(MQTT_TOPIC_RFLEARN,
         [](char * buffer, size_t len) {