diff --git a/trunk/bootrom/build/buildtools/commondefs b/trunk/bootrom/build/buildtools/commondefs
index a86807f..fd38a1a 100644
--- a/trunk/bootrom/build/buildtools/commondefs
+++ b/trunk/bootrom/build/buildtools/commondefs
@@ -135,7 +135,7 @@ CTR_DEBUGGER	?= $(BROM_DEBUGGER)
 #  BROM-SDK path settings
 #
 
-BROM_ROOT			:= $(subst $(SPACE),\ ,$(subst \,/,$(CTRBROM_ROOT)))
+BROM_ROOT			:= $(call eupath,$(CTRBROM_ROOT))
 BROM_BUILDTOOLSDIR	:= $(BROM_ROOT)/build/buildtools
 BROM_BUILDSETUPDIR	:= $(BROM_ROOT)/build/buildsetup
 BROM_INCDIR		:= $(BROM_ROOT)/include
@@ -144,8 +144,8 @@ BROM_KEYSDIR		:= $(BROM_ROOT)/build/keys
 BROM_COMPONENTSDIR	:= $(BROM_ROOT)/components
 BROM_ADDINS		?= $(BROM_ROOT)/add-ins
 
-BROM_CTRSDK_ROOT     ?=$(shell cygpath -w $(CTRSDK_ROOT))
-BROM_CTRFIRM_ROOT    ?=$(shell cygpath -w $(CTRFIRM_ROOT))
+BROM_CTRSDK_ROOT     ?= $(call eupath,$(CTRBROM_ROOT))
+BROM_CTRFIRM_ROOT    ?= $(call eupath,$(CTRFIRM_ROOT))
 
 BROM_CTRFIRM_INCDIR		:= $(BROM_CTRFIRM_ROOT)/include
 BROM_CTRFIRM_TOOLSDIR	:= $(BROM_CTRFIRM_ROOT)/tools
@@ -290,8 +290,8 @@ MAKENANDFIRM		:= $(BROM_CTRFIRM_TOOLSDIR)/bin/makenandfirm.exe
 MAKEGCDFIRM		:= $(BROM_CTRFIRM_TOOLSDIR)/bin/makegcdfirm.exe
 OPENSSL			:= $(BROM_CTRFIRM_TOOLSDIR)/openssl/openssl.exe
 
-MAKEFIRM_RSA_PRVKEY	?= $(shell cygpath -m $(BROM_CTRFIRM_TOOLSDIR))/openssl/rsa_private.der
-MAKEFIRM_RSA_PUBKEY	?= $(shell cygpath -m $(BROM_CTRFIRM_TOOLSDIR))/openssl/rsa_public.der
+MAKEFIRM_RSA_PRVKEY	?= $(call eupath,$(BROM_CTRFIRM_TOOLSDIR))/openssl/rsa_private.der
+MAKEFIRM_RSA_PUBKEY	?= $(call eupath,$(BROM_CTRFIRM_TOOLSDIR))/openssl/rsa_public.der
 
 MAKEFIRM_FLAGS	?=
 
diff --git a/trunk/bootrom/build/buildtools/modulerules b/trunk/bootrom/build/buildtools/modulerules
index 9162e02..04a6590 100644
--- a/trunk/bootrom/build/buildtools/modulerules
+++ b/trunk/bootrom/build/buildtools/modulerules
@@ -45,10 +45,6 @@ MAKEFIRM_DEFS	+= -DFIRM_ROOT='$(BROM_CTRFIRM_ROOT)' \
 
 SDEPENDS_BIN		+= $(MAKEFIRM_RSA_PRVKEY)
 
-FIRM_SDEPENDS_BIN	:= \
-				$(call eupath,$(MAKEFIRM_ARM11)) \
-				$(call eupath,$(MAKEFIRM_ARM9)) \
-
 
 .PHONY: 	bromtop bromlib bromdbg
 
@@ -66,15 +62,15 @@ bromdbg:
 
 # .srl
 # .nor
-$(BINDIR)/%.srl $(BINDIR)/%.nor: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE)
+$(BINDIR)/%.srl $(BINDIR)/%.nor: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENORFIRM) $(MAKEFIRM_RSA_PRVKEY)
 	$(MAKENORFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .nand
-$(BINDIR)/%.srl $(BINDIR)/%.nand: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE)
+$(BINDIR)/%.srl $(BINDIR)/%.nand: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENANDFIRM) $(MAKEFIRM_RSA_PRVKEY)
 	$(MAKENANDFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .gcd
-$(BINDIR)/%.srl $(BINDIR)/%.gcd: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE)
+$(BINDIR)/%.srl $(BINDIR)/%.gcd: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKEGCDFIRM) $(MAKEFIRM_RSA_PRVKEY)
 	$(MAKEGCDFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .sbin