diff --git a/build/cl.py b/build/cl.py
index f2129d75abdd..00318ade63f2 100644
--- a/build/cl.py
+++ b/build/cl.py
@@ -44,7 +44,7 @@ def InvokeClWithDependencyGeneration(cmdline):
     if ret != 0 or target == "":
         sys.exit(ret)
 
-    depsdir = os.path.normpath(os.path.join(os.path.dirname(target), ".deps"))
+    depsdir = os.path.normpath(os.path.join(os.curdir, ".deps"))
     depstarget = os.path.join(depsdir, depstarget)
     if not os.path.isdir(depsdir):
         try:
diff --git a/config/rules.mk b/config/rules.mk
index f6c29bc34cca..b6cd5b4aad7c 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1497,7 +1497,7 @@ $(CURDIR)/$(MDDEPDIR):
 	$(MKDIR) -p $@
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(MDDEPDIR)/*.pp))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 # The script mddepend.pl checks the dependencies and writes to stdout
diff --git a/js/src/build/cl.py b/js/src/build/cl.py
index f2129d75abdd..00318ade63f2 100644
--- a/js/src/build/cl.py
+++ b/js/src/build/cl.py
@@ -44,7 +44,7 @@ def InvokeClWithDependencyGeneration(cmdline):
     if ret != 0 or target == "":
         sys.exit(ret)
 
-    depsdir = os.path.normpath(os.path.join(os.path.dirname(target), ".deps"))
+    depsdir = os.path.normpath(os.path.join(os.curdir, ".deps"))
     depstarget = os.path.join(depsdir, depstarget)
     if not os.path.isdir(depsdir):
         try:
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index f6c29bc34cca..b6cd5b4aad7c 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1497,7 +1497,7 @@ $(CURDIR)/$(MDDEPDIR):
 	$(MKDIR) -p $@
 
 ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
-MDDEPEND_FILES		:= $(strip $(wildcard $(MDDEPDIR)/*.pp))
+MDDEPEND_FILES		:= $(strip $(wildcard $(foreach file,$(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
 
 ifneq (,$(MDDEPEND_FILES))
 # The script mddepend.pl checks the dependencies and writes to stdout
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index c2f0549bb9f0..397371f4eb44 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -83,6 +83,8 @@ SHARED_LIBRARY_LIBS = \
   ../wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \
   $(NULL)
 
+EXTRA_MDDEPEND_FILES = dom_qsgen.pp dombindingsgen.pp dictionary_helper_gen.pp event_impl_gen.pp
+
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
index 82bccd4a953e..433e6ba50efe 100644
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -483,6 +483,8 @@ endif
 
 endif
 
+EXTRA_MDDEPEND_FILES = asm_enc_offsets.s.pp asm_enc_offsets.$(OBJ_SUFFIX).pp asm_com_offsets.s.pp asm_com_offsets.$(OBJ_SUFFIX).pp
+
 include $(topsrcdir)/config/rules.mk
 
 # This must be after rules.mk in order to use $(OBJ_SUFFIX) outside a