diff --git a/cairo/Makefile b/cairo/Makefile
index 84836b388..42628c374 100644
--- a/cairo/Makefile
+++ b/cairo/Makefile
@@ -165,7 +165,11 @@ uninstall:
 $(CAIROOBJECTS):	../makeinclude
 
 depend: $(CAIROCPPFILES)
-	makedepend -Y -I.. -f makedepend $(CAIROCPPFILES)
+	makedepend -Y -I.. -f makedepend -w 20 $(CAIROCPPFILES)
+	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp
+	echo "" >> makedepend.tmp
+	grep '^[a-zA-Z]' makedepend | sort -u >> makedepend.tmp
+	mv makedepend.tmp makedepend
 
 include makedepend
 
diff --git a/fluid/Makefile b/fluid/Makefile
index 1100c9a3b..e6a39f5e4 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -71,7 +71,11 @@ clean:
 	-$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)
 
 depend:	$(CPPFILES)
-	makedepend -Y -I.. -f makedepend $(CPPFILES)
+	makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES)
+	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp
+	echo "" >> makedepend.tmp
+	grep '^[a-zA-Z]' makedepend | sort -u >> makedepend.tmp
+	mv makedepend.tmp makedepend
 
 # Automatically generated dependencies...
 include makedepend
diff --git a/src/Makefile b/src/Makefile
index 96a769f21..9c2622d0d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -605,8 +605,12 @@ clean:
 		cmap core
 
 depend:	$(CPPFILES) $(MMFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES) $(XLIBCFILES)
-	makedepend -Y -I.. -f makedepend $(CPPFILES) $(MMFILES) $(FLCPPFILES) \
+	makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES) $(MMFILES) $(FLCPPFILES) \
 		$(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)  $(XLIBCFILES)
+	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp
+	echo "" >> makedepend.tmp
+	grep '^[a-zA-Z]' makedepend | sort -u >> makedepend.tmp
+	mv makedepend.tmp makedepend
 
 # Automatically generated dependencies... generated on a Linux/Unix host !
 include makedepend
diff --git a/test/Makefile b/test/Makefile
index 1aae81534..dedaebfdb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -187,7 +187,11 @@ all:	$(ALL) $(GLDEMOS)
 gldemos:	$(GLALL)
 
 depend:	$(CPPFILES)
-	makedepend -Y -I.. -f makedepend $(CPPFILES)
+	makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES)
+	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp
+	echo "" >> makedepend.tmp
+	grep '^[a-zA-Z]' makedepend | sort -u >> makedepend.tmp
+	mv makedepend.tmp makedepend
 
 # Automatically generated dependencies...
 include makedepend