diff --git a/Makefile b/Makefile
index e64264e1a5..878f17f558 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 	cp -p $< $@
 	$(STRIP) $@
 
-SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES
+SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES DIRS
 
 define RESET
 $(1) :=
diff --git a/common.mak b/common.mak
index 1fbdf2b489..2ec0dffd13 100644
--- a/common.mak
+++ b/common.mak
@@ -87,9 +87,6 @@ endef
 
 $(eval $(RULES))
 
-# Clear DIRS variable so that it is not used in other subdirectories.
-DIRS =
-
 tests: $(TESTS)
 
 -include $(DEPS)