--- elfutils-0.155.orig/src/addr2line.c	2012-08-27 18:29:31.000000000 +0000
+++ elfutils-0.155.orig/src/addr2line.c	2013-05-20 22:39:59.231647796 +0000
@@ -30,7 +30,6 @@ 
 #include <dwarf.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -121,9 +120,6 @@ 
   int remaining;
   int result = 0;
 
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
 
--- elfutils-0.155.orig/src/ar.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/ar.c	2013-05-20 22:40:10.431647717 +0000
@@ -28,7 +28,6 @@ 
 #include <libintl.h>
 #include <limits.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <search.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -141,9 +140,6 @@ 
 int
 main (int argc, char *argv[])
 {
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
--- elfutils-0.155.orig/src/ld.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/ld.c	2013-05-20 22:41:25.431647187 +0000
@@ -26,7 +26,6 @@ 
 #include <libelf.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdio.h>
 #include <stdio_ext.h>
 #include <stdlib.h>
@@ -277,11 +276,6 @@ 
   int remaining;
   int err;
 
-#ifndef NDEBUG
-  /* Enable memory debugging.  */
-  mtrace ();
-#endif
-
   /* Sanity check.  We always want to use the LFS functionality.  */
   if (sizeof (off_t) != sizeof (off64_t))
     abort ();
--- elfutils-0.155.orig/src/nm.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/nm.c	2013-05-20 22:41:37.061647104 +0000
@@ -33,7 +33,6 @@ 
 #include <libdw.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <obstack.h>
 #include <search.h>
 #include <stdbool.h>
@@ -217,9 +216,6 @@ 
   int remaining;
   int result = 0;
 
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
--- elfutils-0.155.orig/src/objdump.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/objdump.c	2013-05-20 22:41:48.531647023 +0000
@@ -26,7 +26,6 @@ 
 #include <inttypes.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -131,9 +130,6 @@ 
 int
 main (int argc, char *argv[])
 {
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
--- elfutils-0.155.orig/src/ranlib.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/ranlib.c	2013-05-20 22:42:03.951646914 +0000
@@ -29,7 +29,6 @@ 
 #include <gelf.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <obstack.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -78,9 +77,6 @@ 
 int
 main (int argc, char *argv[])
 {
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   (void) __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   (void) __fsetlocking (stdout, FSETLOCKING_BYCALLER);
--- elfutils-0.155.orig/src/size.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/size.c	2013-05-20 22:42:16.271646827 +0000
@@ -28,7 +28,6 @@ 
 #include <libelf.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -160,9 +159,6 @@ 
   int remaining;
   int result = 0;
 
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   __fsetlocking (stdout, FSETLOCKING_BYCALLER);
--- elfutils-0.155.orig/src/strip.c	2012-08-27 18:29:31.000000000 +0000
+++ elfutils-0.155.orig/src/strip.c	2013-05-20 22:42:28.781646739 +0000
@@ -30,7 +30,6 @@ 
 #include <libelf.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -155,9 +154,6 @@ 
   int remaining;
   int result = 0;
 
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   __fsetlocking (stdout, FSETLOCKING_BYCALLER);
--- elfutils-0.155.orig/src/unstrip.c	2012-08-27 18:27:31.000000000 +0000
+++ elfutils-0.155.orig/src/unstrip.c	2013-05-20 22:42:44.201646629 +0000
@@ -36,7 +36,6 @@ 
 #include <fnmatch.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
@@ -2215,9 +2214,6 @@ 
 int
 main (int argc, char **argv)
 {
-  /* Make memory leak detection possible.  */
-  mtrace ();
-
   /* We use no threads here which can interfere with handling a stream.  */
   __fsetlocking (stdin, FSETLOCKING_BYCALLER);
   __fsetlocking (stdout, FSETLOCKING_BYCALLER);