diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h
index 8a5127e98..5e7cbce76 100644
--- a/radio/src/audio_arm.h
+++ b/radio/src/audio_arm.h
@@ -37,6 +37,7 @@
 #ifndef audio_h
 #define audio_h
 
+#include <stddef.h>
 #include "FatFs/ff.h"
 
 #define AUDIO_FILENAME_MAXLEN (40)
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 497ea743d..062f9cad7 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -90,6 +90,8 @@
   #define AVR_FIELD(x) x;
 #endif
 
+#define NUM_STICKS             4
+
 #if defined(PCBTARANIS)
   #define MAX_MODELS           60
   #define NUM_CHNOUT           32 // number of real output channels CH1-CH32
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 14db1ced6..b14b4cb3e 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -315,9 +315,6 @@ extern void boardInit();
 #include <avr/wdt.h>
 #endif
 
-#define NUM_STICKS    4
-
-
 #if defined(PCBTARANIS)
   #define NUM_SWITCHES  8
   #define IS_3POS(sw)   ((sw) != 5 && (sw) != 7)
@@ -394,7 +391,7 @@ enum PotType {
 #if defined(CPUARM)
   #include "fifo.h"
   // This doesn't need protection on this processor
-  #define tmr10ms_t uint32_t
+  typedef uint32_t tmr10ms_t;
   extern volatile tmr10ms_t g_tmr10ms;
   #define get_tmr10ms() g_tmr10ms
   typedef int32_t rotenc_t;