diff --git a/make/defs.mk b/make/defs.mk
index 8b1fd10b..8dc1d69f 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -1084,7 +1084,7 @@ echo-makefiles:
 	$(Q)strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
 
 cat-makefiles:
-	Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; cat $$f; done
+	Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; sed 's/^include/#cat include/' $$f; done
 
 doc-module:
 	$(BROWSER) $(JANWARE_URL_DOC_MODULE)
diff --git a/make/dirs.mk b/make/dirs.mk
index 7806cd8b..dbe4c2bc 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -33,7 +33,6 @@ SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
 endif
 
 ifneq ($(DONT_CHECK_PREREQ_DONE),true)
-PREREQ += $(call proj_query, prereq build $(PROJECT))
 PREREQ_DIRS = $(foreach p, $(PREREQ), $(call proj_dir, $(p)))
 PREREQ_DIRS_DONE = $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
 endif
diff --git a/make/topdir.mk b/make/topdir.mk
index 834dc347..c5fe6332 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -156,7 +156,7 @@ prefix.done:
 	touch $@
 
 echo-prereq-build:
-	@echo $(call proj_query, requires-pkg --flavours "build" $(PROJECT))
+	@echo $(call proj_query, pkg-requires --flavours "build" $(PROJECT))
 
 list-files echo-files:
 	@$(LIST_VCS_FILES) -f