diff --git a/radio/src/Makefile b/radio/src/Makefile
index 035a659d3..1c59a2b28 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1482,7 +1482,7 @@ endif
 
 lua_exports.cpp: myeeprom.h ../util/luaexport.py
 	@echo "Generating a list of Lua exported constants in lua_exports.txt" 
-	@$(PARSER) -DPCBTARANIS -DCPUARM -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt
+	@$(PARSER) -DPCBTARANIS -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt
 	@echo "Parsing and generating C Lua exports in lua_exports.cpp"
 	@$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.cpp lua_fields.txt
 	@rm lua_exports.txt
diff --git a/radio/src/bootloader/Makefile b/radio/src/bootloader/Makefile
index 5af6a65a2..c7f796ea0 100644
--- a/radio/src/bootloader/Makefile
+++ b/radio/src/bootloader/Makefile
@@ -284,6 +284,12 @@ DIRS = $(sort $(dir $(AXOBJS) $(CXOBJS) $(CPPXOBJS) ) )
 
 CPPDEFS += -DCPUARM
 
+ifeq ($(PCB), TARANIS)
+  CPPDEFS += -DCPUSTM32
+endif
+
+CPPDEFS += -DTIMERS=0
+
 # If serial Debug required
 ifeq ($(DEBUG), 1)
  CPPDEFS += -DDEBUG
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 6d3b8deda..c9bfaa994 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1208,7 +1208,7 @@ LimitData *limitAddress(uint8_t idx);
 int8_t *curveAddress(uint8_t idx);
 LogicalSwitchData *lswAddress(uint8_t idx);
 
-#if !defined(XCURVES)
+#if !defined(BOOT) && !defined(XCURVES)
 struct CurveInfo {
   int8_t *crv;
   uint8_t points;
diff --git a/radio/src/timers.h b/radio/src/timers.h
index 44cdf5f87..363a0bbd4 100644
--- a/radio/src/timers.h
+++ b/radio/src/timers.h
@@ -34,8 +34,8 @@
  *
  */
 
-#ifndef timers_h
-#define timers_h
+#ifndef _TIMERS_H_
+#define _TIMERS_H_
 
 #define TMR_OFF      0
 #define TMR_RUNNING  1