ChangeLog, mtrace.c, mtrace.h:
  malloc.h, mtrace.c: Renamed malloc.h to mtrace.h to avoid conflicts
  	with the system header file.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index b302761..d4f2885 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-30    <tytso@snap.thunk.org>
 
+	* malloc.h, mtrace.c: Renamed malloc.h to mtrace.h to avoid
+		conflicts with the system header file.
+
 	* problem.h: Fixed numbering of pass1 error messages; an extra 0
 		had slipped into some of the numbers.  (Pointed out by
 		Andreas Dilger)