diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm
index ff4aeba0..08da0997 100644
--- a/build/buildtools/commondefs.firm
+++ b/build/buildtools/commondefs.firm
@@ -35,11 +35,17 @@ override TARGET_PLATFORM	:= TWL
 override TWL_ARCHGEN		:= LIMITED
 override TWL_MEMSIZE		:= 16M
 
+#----------------------------------------------------------------------------
+### TWL-commondefs
+#
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+include	$(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot
+
 #----------------------------------------------------------------------------
 #  TWL-FIRM path settings
 #
 
-FIRM_ROOT		:= $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT)))
+FIRM_ROOT		:= $(call eupath,$(TWL_IPL_RED_ROOT))
 FIRM_BUILDTOOLSDIR	:= $(FIRM_ROOT)/build/buildtools
 FIRM_BUILDSETUPDIR	:= $(FIRM_ROOT)/build/buildsetup
 FIRM_INCDIR		:= $(FIRM_ROOT)/include
@@ -47,9 +53,6 @@ FIRM_TOOLSDIR		:= $(FIRM_ROOT)/tools
 FIRM_COMPONENTSDIR	:= $(FIRM_ROOT)/components
 FIRM_ADDINS		?= $(FIRM_ROOT)/add-ins
 
-FIRM_TWLSDK_ROOT     ?=$(shell cygpath -w $(TWLSDK_ROOT))
-FIRM_NITROSDK_ROOT   ?=$(shell cygpath -w $(NITROSDK_ROOT))
-
 FIRM_LIBDIR		= $(FIRM_ROOT)/lib/$(TWL_LIBTYPE)
 FIRM_LIBSUFFIX		= .firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH)
 
@@ -64,19 +67,13 @@ DEFAULT_FIRM_ROM_SPEC	= $(FIRM_SPECDIR)/ROM-$(TWL_PLATFORM)-FIRM.rsf
 ### Compiler & Linker settings
 
 # replace NitroSDK
-LCFILE_TEMPLATE		?= $(DEFAULT_FIRM_LCFILE_TEMPLATE)
-LCFILE_SPEC		?= $(DEFAULT_FIRM_LCFILE_SPEC)
-ROM_SPEC		?= $(DEFAULT_FIRM_ROM_SPEC)
+DEFAULT_LCFILE_TEMPLATE		= $(DEFAULT_FIRM_LCFILE_TEMPLATE)
+DEFAULT_LCFILE_SPEC		= $(DEFAULT_FIRM_LCFILE_SPEC)
+DEFAULT_ROM_SPEC		= $(DEFAULT_FIRM_ROM_SPEC)
 
 LDEPENDS_LCF	+= $(FIRM_BUILDTOOLSDIR)/commondefs
 LDEPENDS_RES	+= $(FIRM_BUILDTOOLSDIR)/commondefs
 
-#----------------------------------------------------------------------------
-### TWL-commondefs
-#
-include	$(TWLSDK_ROOT)/build/buildtools/commondefs
-include	$(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot
-
 ### SDK Library settings
 
 ifeq	($(CODEGEN_PROC),ARM9)
diff --git a/build/buildtools/modulerules.firm b/build/buildtools/modulerules.firm
index 2b3062e3..8aa7e534 100644
--- a/build/buildtools/modulerules.firm
+++ b/build/buildtools/modulerules.firm
@@ -34,11 +34,18 @@ endif
 #
 # MAKENORFIRM / MAKENANDFIRM / MAKEGCDFIRM
 #
+MAKEFIRM_ARM7		?= ARM7/bin/$(TWL_BUILDTYPE_ARM7)/main.tef
+MAKEFIRM_ARM9		?= ARM9/bin/$(TWL_BUILDTYPE_ARM9)/main.tef
+MAKEFIRM_RSA_PRVKEY	?= $(TWL_KEYSDIR)/rsa/pubkey_nor.der
+
+MAKEFIRM_ARM7_M		:= $(call empath,$(MAKEFIRM_ARM7))
+MAKEFIRM_ARM9_M		:= $(call empath,$(MAKEFIRM_ARM9))
+MAKEFIRM_RSA_PRVKEY_M	:= $(call empath,$(MAKEFIRM_RSA_PRVKEY))
 
 MAKEFIRM_DEFS	+= -DFIRM_ROOT='$(FIRM_ROOT)' \
-				-DMAKEFIRM_ARM9='$(basename $(MAKEFIRM_ARM9))' \
-				-DMAKEFIRM_ARM7='$(basename $(MAKEFIRM_ARM7))' \
-				-DMAKEFIRM_RSA_PRVKEY='$(MAKEFIRM_RSA_PRVKEY)' \
+				-DMAKEFIRM_ARM9='$(basename $(MAKEFIRM_ARM9_M))' \
+				-DMAKEFIRM_ARM7='$(basename $(MAKEFIRM_ARM7_M))' \
+				-DMAKEFIRM_RSA_PRVKEY='$(MAKEFIRM_RSA_PRVKEY_M)' \
 
 ifdef TWL_KEYSDIR
 MAKEGCDFIRM_FLAGS	+= -t'$(TWL_KEYSDIR)/blowfish/gcdfirm_header_twlj.template.sbin'
@@ -46,7 +53,9 @@ else
 MAKEGCDFIRM_FLAGS	+= -t'$(FIRM_ROOT)/build/tools/makegcdfirm/gcdfirm_header_twlj.template.sbin'
 endif
 
-FIRM_SDEPENDS_BIN	= $(MAKEFIRM_RSA_PRVKEY) $(MAKEFIRM_ARM9) $(MAKEFIRM_ARM7)
+FIRM_SDEPENDS_BIN	:= $(call eupath,$(MAKEFIRM_RSA_PRVKEY)) \
+				$(call eupath,$(MAKEFIRM_ARM9)) \
+				$(call eupath,$(MAKEFIRM_ARM7))
 
 
 .PHONY: 	firmtop firmlib
@@ -58,15 +67,15 @@ firmlib:
 	@$(MAKE) -C $(TWL_IPL_RED_ROOT)/build/libraries
 
 # .nor
-$(BINDIR)/%.nor: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENORFIRM)
+$(BINDIR)/%.nor: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE)
 	$(MAKENORFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .nand
-$(BINDIR)/%.nand: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENANDFIRM)
+$(BINDIR)/%.nand: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE)
 	$(MAKENANDFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .gcd
-$(BINDIR)/%.gcd: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKEGCDFIRM)
+$(BINDIR)/%.gcd: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE)
 	$(MAKEGCDFIRM) $(MAKEFIRM_FLAGS) $(MAKEGCDFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .rbin