diff --git a/radio/src/gui/128x64/model_input_edit.cpp b/radio/src/gui/128x64/model_input_edit.cpp
index 2ab620a73..a36a9fc4c 100644
--- a/radio/src/gui/128x64/model_input_edit.cpp
+++ b/radio/src/gui/128x64/model_input_edit.cpp
@@ -26,7 +26,7 @@
 int expoFn(int x)
 {
   ExpoData * ed = expoAddress(s_currIdx);
-  int16_t anas[NUM_INPUTS] = {0};
+  int16_t anas[MAX_INPUTS] = {0};
   applyExpos(anas, e_perout_mode_inactive_flight_mode, ed->srcRaw, x);
   return anas[ed->chn];
 }
diff --git a/radio/src/gui/128x64/model_inputs_mixes.cpp b/radio/src/gui/128x64/model_inputs_mixes.cpp
index 83b2b12e4..7fc9d5a44 100644
--- a/radio/src/gui/128x64/model_inputs_mixes.cpp
+++ b/radio/src/gui/128x64/model_inputs_mixes.cpp
@@ -26,7 +26,7 @@
 int expoFn(int x)
 {
   ExpoData *ed = expoAddress(s_currIdx);
-  int16_t anas[NUM_INPUTS] = {0};
+  int16_t anas[MAX_INPUTS] = {0};
   anas[ed->chn] = x;
   applyExpos(anas, e_perout_mode_inactive_flight_mode);
   return anas[ed->chn];
@@ -153,7 +153,7 @@ bool swapExpoMix(uint8_t expo, uint8_t &idx, uint8_t up)
     }
 
     if (tgt_idx == MAX_EXPOS) {
-      if (((ExpoData *)x)->chn == NUM_INPUTS-1)
+      if (((ExpoData *)x)->chn == MAX_INPUTS-1)
         return false;
       ((ExpoData *)x)->chn++;
       return true;
@@ -166,7 +166,7 @@ bool swapExpoMix(uint8_t expo, uint8_t &idx, uint8_t up)
         else return false;
       }
       else {
-        if (((ExpoData *)x)->chn<NUM_INPUTS-1) ((ExpoData *)x)->chn++;
+        if (((ExpoData *)x)->chn<MAX_INPUTS-1) ((ExpoData *)x)->chn++;
         else return false;
       }
       return true;
@@ -741,7 +741,7 @@ void menuModelExpoMix(uint8_t expo, event_t event)
   uint8_t cur = 1;
   uint8_t i = 0;
 
-  for (uint8_t ch=1; ch<=(expo ? NUM_INPUTS : MAX_OUTPUT_CHANNELS); ch++) {
+  for (uint8_t ch=1; ch<=(expo ? MAX_INPUTS : MAX_OUTPUT_CHANNELS); ch++) {
     void *pointer = NULL; MixData * &md = (MixData * &)pointer; ExpoData * &ed = (ExpoData * &)pointer;
     coord_t y = MENU_HEADER_HEIGHT-FH+1+(cur-menuVerticalOffset)*FH;
     if (expo ? (i<MAX_EXPOS && (ed=expoAddress(i))->chn+1 == ch && EXPO_VALID(ed)) : (i<MAX_MIXERS && (md=mixAddress(i))->srcRaw && md->destCh+1 == ch)) {
diff --git a/radio/src/gui/212x64/model_input_edit.cpp b/radio/src/gui/212x64/model_input_edit.cpp
index c033faa66..28233fd07 100644
--- a/radio/src/gui/212x64/model_input_edit.cpp
+++ b/radio/src/gui/212x64/model_input_edit.cpp
@@ -25,7 +25,7 @@
 int expoFn(int x)
 {
   ExpoData * ed = expoAddress(s_currIdx);
-  int16_t anas[NUM_INPUTS] = {0};
+  int16_t anas[MAX_INPUTS] = {0};
   applyExpos(anas, e_perout_mode_inactive_flight_mode, ed->srcRaw, x);
   return anas[ed->chn];
 }
diff --git a/radio/src/gui/480x272/model_inputs.cpp b/radio/src/gui/480x272/model_inputs.cpp
index cd6391d5d..3ee84c047 100644
--- a/radio/src/gui/480x272/model_inputs.cpp
+++ b/radio/src/gui/480x272/model_inputs.cpp
@@ -26,7 +26,7 @@
 int expoFn(int x)
 {
   ExpoData * ed = expoAddress(s_currIdx);
-  int16_t anas[NUM_INPUTS] = {0};
+  int16_t anas[MAX_INPUTS] = {0};
   applyExpos(anas, e_perout_mode_inactive_flight_mode, ed->srcRaw, x);
   return anas[ed->chn];
 }
@@ -128,7 +128,7 @@ bool swapExpos(uint8_t & idx, uint8_t up)
   }
 
   if (tgt_idx == MAX_EXPOS) {
-    if (x->chn == NUM_INPUTS-1)
+    if (x->chn == MAX_INPUTS-1)
       return false;
     x->chn++;
     return true;
@@ -141,7 +141,7 @@ bool swapExpos(uint8_t & idx, uint8_t up)
       else return false;
     }
     else {
-      if (x->chn<NUM_INPUTS-1) x->chn++;
+      if (x->chn<MAX_INPUTS-1) x->chn++;
       else return false;
     }
     return true;
@@ -499,7 +499,7 @@ bool menuModelExposAll(event_t event)
   int cur = 0;
   int i = 0;
 
-  for (int ch=1; ch<=NUM_INPUTS; ch++) {
+  for (int ch=1; ch<=MAX_INPUTS; ch++) {
     ExpoData * ed;
     coord_t y = MENU_CONTENT_TOP + (cur-menuVerticalOffset)*FH;
     if ((i<MAX_EXPOS && (ed=expoAddress(i))->chn+1 == ch && EXPO_VALID(ed))) {
diff --git a/radio/src/gui/common/stdlcd/model_inputs.cpp b/radio/src/gui/common/stdlcd/model_inputs.cpp
index 17455b14a..2e11b17d6 100644
--- a/radio/src/gui/common/stdlcd/model_inputs.cpp
+++ b/radio/src/gui/common/stdlcd/model_inputs.cpp
@@ -87,7 +87,7 @@ bool swapExpos(uint8_t & idx, uint8_t up)
   }
   
   if (tgt_idx == MAX_EXPOS) {
-    if (x->chn == NUM_INPUTS-1)
+    if (x->chn == MAX_INPUTS-1)
       return false;
     x->chn++;
     return true;
@@ -100,7 +100,7 @@ bool swapExpos(uint8_t & idx, uint8_t up)
       else return false;
     }
     else {
-      if (x->chn<NUM_INPUTS-1) x->chn++;
+      if (x->chn<MAX_INPUTS-1) x->chn++;
       else return false;
     }
     return true;
@@ -387,7 +387,7 @@ void menuModelExposAll(event_t event)
   int cur = 0;
   int i = 0;
   
-  for (int ch=1; ch<=NUM_INPUTS; ch++) {
+  for (int ch=1; ch<=MAX_INPUTS; ch++) {
     ExpoData * ed;
     coord_t y = MENU_HEADER_HEIGHT+1+(cur-menuVerticalOffset)*FH;
     if (i<MAX_EXPOS && (ed=expoAddress(i))->chn+1 == ch && EXPO_VALID(ed)) {
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index 0c738569a..8905ca00d 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -21,8 +21,8 @@
 #include "opentx.h"
 #include "timers.h"
 
-int8_t  virtualInputsTrims[NUM_INPUTS];
-int16_t anas [NUM_INPUTS] = {0};
+int8_t  virtualInputsTrims[MAX_INPUTS];
+int16_t anas [MAX_INPUTS] = {0};
 int16_t trims[NUM_TRIMS] = {0};
 int32_t chans[MAX_OUTPUT_CHANNELS] = {0};
 BeepANACenter bpanaCenter = 0;
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 0ede92872..84f84134b 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1617,7 +1617,7 @@ void opentxResume()
 
 void instantTrim()
 {
-  int16_t  anas_0[NUM_INPUTS];
+  int16_t  anas_0[MAX_INPUTS];
   evalInputs(e_perout_mode_notrainer | e_perout_mode_nosticks);
   memcpy(anas_0, anas, sizeof(anas_0));
 
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 0492709ef..595fa57dd 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -748,8 +748,6 @@ extern int32_t            chans[MAX_OUTPUT_CHANNELS];
 extern int16_t            ex_chans[MAX_OUTPUT_CHANNELS]; // Outputs (before LIMITS) of the last perMain
 extern int16_t            channelOutputs[MAX_OUTPUT_CHANNELS];
 
-#define NUM_INPUTS      (MAX_INPUTS)
-
 int expo(int x, int k);
 
 inline void getMixSrcRange(const int source, int16_t & valMin, int16_t & valMax, LcdFlags * flags = 0)
@@ -865,9 +863,9 @@ LogicalSwitchData * lswAddress(uint8_t idx);
 
 // static variables used in evalFlightModeMixes - moved here so they don't interfere with the stack
 // It's also easier to initialize them here.
-extern int8_t  virtualInputsTrims[NUM_INPUTS];
+extern int8_t  virtualInputsTrims[MAX_INPUTS];
 
-extern int16_t anas [NUM_INPUTS];
+extern int16_t anas [MAX_INPUTS];
 extern int16_t trims[NUM_TRIMS];
 extern BeepANACenter bpanaCenter;