@@ -215,14 +215,14 @@
 # first pass: copy all headers into place,
 # including ones we need to generate
 
 for mod in ${modules[@]}; do
-	for h in $(scan $mod '*.h'); do
+	for h in $(scan mod/$mod '*.h'); do
 		base=$(basename $h)
 		cp "$h" "$to/k/$base"
 	done
 
-	for h in $(scan $mod '*.h.m'); do
+	for h in $(scan mod/$mod '*.h.m'); do
 		base=$(basename $h)
 		dest=${base%%.m}
 		comp_mac "$h" "$to/k/$dest"
 	done
@@ -233,9 +233,9 @@
 
 if test "$doc" = "yes"; then
 	global/build-manpage.sh libk.md
 	for mod in ${modules[@]}; do
-		for doc in $(scan $mod '*.md'); do
+		for doc in $(scan mod/$mod '*.md'); do
 			base="$(basename $doc)"
 			stem="${base%%.md}"
 			report global/build-manpage.sh "$doc"
 		done
@@ -250,30 +250,30 @@
 fn_objects=()
 rt_objects=()
 data_objects=( $to/internal.ident.o )
 for mod in ${modules[@]}; do
-	for fn in $(scan $mod '*.fn.c'); do
+	for fn in $(scan mod/$mod '*.fn.c'); do
 		base="$(basename $fn)"
 		dest="$to/$mod.${base%%.c}.o"
 		comp_co "$fn" "$dest"
 		fn_objects+=("$dest")
 	done
 
-	for rt in $(scan $mod '*.rt.c'); do
+	for rt in $(scan mod/$mod '*.rt.c'); do
 		base="$(basename $rt)"
 		dest="$to/$mod.${base%%.c}.o"
 		comp_co "$rt" "$dest"
 		rt_objects+=("$dest")
 	done
 
-	for fn in $(scan $mod "*.fn.$target.s"); do
+	for fn in $(scan mod/$mod "*.fn.$target.s"); do
 		base="$(basename $fn)"
 		dest="$to/$mod.${base%%.s}.o"
 		comp_asm "$fn" "$dest"
 		fn_objects+=("$dest")
 	done
 
-	for rt in $(scan $mod "*.rt.$target.s"); do
+	for rt in $(scan mod/$mod "*.rt.$target.s"); do
 		base="$(basename $rt)"
 		dest="$to/$mod.${base%%.s}.o"
 		comp_asm "$rt" "$dest"
 		rt_objects+=("$dest")
@@ -298,9 +298,9 @@
 # fifth pass: compile the executable tools
 # against the libraries created in pass 5
 
 for mod in ${modules[@]}; do
-	for exe in $(scan $mod '*.exe.c'); do
+	for exe in $(scan mod/$mod '*.exe.c'); do
 		base="$(basename $exe)"
 		dest="$to/$mod.${base%%.exe.c}"
 		if test $build_shared_library == yes; then
 			comp_c "$to/boot.o $exe" "$dest" -lk