diff --git a/Makefile b/Makefile
index ce0a8ea064385f96e3b7c3c8f71b6a602d944a5c..f5b7af5d32106eed81d8c74873167d503a5f4106 100644
--- a/Makefile
+++ b/Makefile
@@ -345,10 +345,14 @@ build/dummy.d: config $(ROOTRC) $(RMKDEP) $(BINDEXP) $(ALLHDRS)
 	fi)
 
 %.d: %.c $(RMKDEP)
-	$(MAKEDEP) $@ "$(CFLAGS)" $*.c > $@
+	$(MAKEDEP) $@ "$(CFLAGS)" $< > $@
+
+G__%.d: G__%.cxx $(RMKDEP)
+	$(MAKEDEP) $@ "$(CXXFLAGS) -I$(CINTDIR)/lib/prec_stl -I$(CINTDIR)/stl" \
+	   $< > $@
 
 %.d: %.cxx $(RMKDEP)
-	$(MAKEDEP) $@ "$(CXXFLAGS)" $*.cxx > $@
+	$(MAKEDEP) $@ "$(CXXFLAGS)" $< > $@
 
 $(CORELIB): $(COREO) $(COREDO) $(CINTLIB) $(CORELIBDEP)
 ifneq ($(ARCH),alphacxx6)
diff --git a/base/Module.mk b/base/Module.mk
index 7f9e36ad23a9c688042b77ddef4fce2914db6742..df5474a6291fb3048af6fb9e4f3df6178b47b5e7 100644
--- a/base/Module.mk
+++ b/base/Module.mk
@@ -76,9 +76,6 @@ distclean-base: clean-base
 distclean::     distclean-base
 
 ##### extra rules ######
-$(BASEDIRS)/G__Base2.d: $(BASEDS2) $(RMKDEP)
-	$(MAKEDEP) $@ "$(CFLAGS) -I$(CINTDIR)/lib/prec_stl -I$(CINTDIR)/stl" \
-	   $*.cxx > $@
 ifeq ($(ARCH),alphacxx6)
 $(BASEDIRS)/TRandom.o: $(BASEDIRS)/TRandom.cxx
 	$(CXX) $(NOOPT) $(CXXFLAGS) -o $@ -c $<