diff --git a/tools/root.make b/tools/root.make
index 0d12e30a4b..c0030970d4 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -98,18 +98,19 @@ clean:
 
 .SECONDEXPANSION:
 
-ifndef SIMVER
-
 ifeq (,$(findstring bootloader,$(APPSDIR)))
 # not bootloader
 
+OBJ += $(LANG_O)
+
+ifndef SIMVER
+
 ## target build
 RAMLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/app.lds
 LINKRAM := $(BUILDDIR)/ram.link
 ROMLDS := $(FIRMDIR)/rom.lds
 LINKROM := $(BUILDDIR)/rom.link
 
-OBJ += $(LANG_O)
 
 $(LINKRAM): $(RAMLDS)
 	$(call PRINTS,PP $(@F))
@@ -180,8 +181,8 @@ $(MAXOUTFILE):
 $(BUILDDIR)/rombox.iriver: $(BUILDDIR)/rombox.bin
 	$(call PRINTS,Build ROM file)$(MKFIRMWARE) $< $@
 
-endif # !bootloader
 endif # !SIMVER
+endif # !bootloader
 
 
 voicetools:
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index b2096c2a1a..d35f2e6d57 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -22,6 +22,8 @@ OTHER_SRC += $(SIMSRC)
 SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a
 UIBMP = $(BUILDDIR)/UI256.bmp
 
+OBJ += $(LANG_O)
+
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this
 
 $(SIMLIB): $$(SIMOBJ) $(UIBMP)