diff --git a/refpolicy/Rules.modular b/refpolicy/Rules.modular
index c04e0470..b24297cd 100644
--- a/refpolicy/Rules.modular
+++ b/refpolicy/Rules.modular
@@ -67,17 +67,17 @@ tmp/pre_te_files.conf: $(BASE_PRE_TE_FILES)
 	@test -d tmp || mkdir -p tmp
 	$(QUIET) cat $^ > $@
 
-tmp/generated_definitions.conf: $(ALL_LAYERS) $(ALL_TE_FILES)
+tmp/generated_definitions.conf: $(ALL_LAYERS) $(BASE_TE_FILES)
 # per-userdomain templates:
 	@test -d tmp || mkdir -p tmp
 	$(QUIET) echo "define(\`per_userdomain_templates',\`" > $@
-	$(QUIET) for i in $(patsubst %.te,%,$(notdir $(ALL_MODULES))); do \
+	$(QUIET) for i in $(patsubst %.te,%,$(notdir $(BASE_TE_FILES))); do \
 		echo "ifdef(\`""$$i""_per_userdomain_template',\`""$$i""_per_userdomain_template("'$$1'")')" \
 			>> $@ ;\
 	done
 	$(QUIET) echo "')" >> $@
 # define foo.te
-	$(QUIET) for i in $(notdir $(ALL_MODULES)); do \
+	$(QUIET) for i in $(notdir $(BASE_TE_FILES)); do \
 		echo "define(\`$$i')" >> $@ ;\
 	done
 	$(QUIET) $(SETTUN) $(TUNABLES) >> $@