diff --git a/fast/f_c.ansi/proto.make b/fast/f_c.ansi/proto.make
index 4b7143830..bb5de8870 100644
--- a/fast/f_c.ansi/proto.make
+++ b/fast/f_c.ansi/proto.make
@@ -160,8 +160,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(FSRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(FSRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(FSRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -184,7 +183,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/fast/f_c/proto.make b/fast/f_c/proto.make
index ff5a9e6a4..2411d0150 100644
--- a/fast/f_c/proto.make
+++ b/fast/f_c/proto.make
@@ -159,8 +159,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(FSRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(FSRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(FSRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -183,7 +182,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/fast/f_m2/proto.make b/fast/f_m2/proto.make
index e8b5a0758..6d5ef870e 100644
--- a/fast/f_m2/proto.make
+++ b/fast/f_m2/proto.make
@@ -84,8 +84,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(FSRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(FSRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(FSRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:    Makefile
@@ -108,7 +107,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/fast/f_pc/proto.make b/fast/f_pc/proto.make
index 29c1ff98e..7ba62a5e0 100644
--- a/fast/f_pc/proto.make
+++ b/fast/f_pc/proto.make
@@ -85,8 +85,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(FSRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(FSRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(FSRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:    Makefile
@@ -109,7 +108,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/fcc/cemcom/proto.make b/fcc/cemcom/proto.make
index bd0c6c59a..960a97152 100644
--- a/fcc/cemcom/proto.make
+++ b/fcc/cemcom/proto.make
@@ -159,8 +159,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(FSRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(FSRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(FSRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -187,7 +186,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/basic/src/proto.make b/lang/basic/src/proto.make
index 0c4ceaaa7..df45382c3 100644
--- a/lang/basic/src/proto.make
+++ b/lang/basic/src/proto.make
@@ -79,8 +79,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -102,7 +101,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/cem/cemcom/proto.make b/lang/cem/cemcom/proto.make
index b07e5bf2c..ae8746e24 100644
--- a/lang/cem/cemcom/proto.make
+++ b/lang/cem/cemcom/proto.make
@@ -162,8 +162,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -185,7 +184,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/cem/cpp.ansi/proto.make b/lang/cem/cpp.ansi/proto.make
index 12c151c48..fb970cbbc 100644
--- a/lang/cem/cpp.ansi/proto.make
+++ b/lang/cem/cpp.ansi/proto.make
@@ -99,8 +99,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -122,7 +121,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/cem/lint/lpass1.ansi/proto.make b/lang/cem/lint/lpass1.ansi/proto.make
index e4205c3f8..0082b0606 100644
--- a/lang/cem/lint/lpass1.ansi/proto.make
+++ b/lang/cem/lint/lpass1.ansi/proto.make
@@ -161,8 +161,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -184,7 +183,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/cem/lint/lpass1/proto.make b/lang/cem/lint/lpass1/proto.make
index 76c52848e..0bdb9df07 100644
--- a/lang/cem/lint/lpass1/proto.make
+++ b/lang/cem/lint/lpass1/proto.make
@@ -158,8 +158,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -181,7 +180,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/cem/lint/lpass2/proto.make b/lang/cem/lint/lpass2/proto.make
index fb089f1d5..2cf82fd2a 100644
--- a/lang/cem/lint/lpass2/proto.make
+++ b/lang/cem/lint/lpass2/proto.make
@@ -49,7 +49,7 @@ pr:
 		$(SRC) lint
 
 lint.exec:	$(SRC_DIR)/lint
-	sed -e 's|^EMDIR=.*|EMDIR=$(TARGET_HOME)|' -e 's/#.*//' < $(SRC_DIR)/lint > lint.exec
+	sed -e 's|^EMDIR=.*|EMDIR=$(TARGET_HOME)|' < $(SRC_DIR)/lint > lint.exec
 	chmod +x lint.exec
 
 lpass2:	$(OBJ) next.$(SUF)
diff --git a/lang/m2/comp/proto.make b/lang/m2/comp/proto.make
index 1a4536e2d..9c82e6fb2 100644
--- a/lang/m2/comp/proto.make
+++ b/lang/m2/comp/proto.make
@@ -86,8 +86,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:    Makefile
@@ -109,7 +108,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/m2/m2mm/proto.make b/lang/m2/m2mm/proto.make
index b02229d96..4a54c8cf7 100644
--- a/lang/m2/m2mm/proto.make
+++ b/lang/m2/m2mm/proto.make
@@ -72,8 +72,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:    Makefile
@@ -95,7 +94,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/occam/comp/proto.make b/lang/occam/comp/proto.make
index c5eaa9f93..e1617ce9b 100644
--- a/lang/occam/comp/proto.make
+++ b/lang/occam/comp/proto.make
@@ -78,8 +78,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:	Makefile
@@ -101,7 +100,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean
diff --git a/lang/pc/comp/proto.make b/lang/pc/comp/proto.make
index 2239ad495..812baa91a 100644
--- a/lang/pc/comp/proto.make
+++ b/lang/pc/comp/proto.make
@@ -83,8 +83,7 @@ dependencies:	resolved
 		do_deps `grep '.c$$' Cfiles`
 
 make.main:	dependencies make_macros lists $(SRC_DIR)/proto.main
-		sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main
-		echo '#DEPENDENCIES' >> make.main
+		rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main
 		cat *.dep >> make.main
 
 make_macros:    Makefile
@@ -106,7 +105,7 @@ lists:		Cfiles
 		echo "C_SRC = \\" > lists
 		echo $(CFILES) >> lists
 		echo "OBJ = \\" >> lists
-		echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists
+		echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists
 
 clean:
 		-make -f make.main clean