diff --git a/mozilla/tools/trace-malloc/lib/Makefile.in b/mozilla/tools/trace-malloc/lib/Makefile.in
index 5efb41c881f..ea74bff9f74 100644
--- a/mozilla/tools/trace-malloc/lib/Makefile.in
+++ b/mozilla/tools/trace-malloc/lib/Makefile.in
@@ -69,5 +69,9 @@ EXTRA_DSO_LDOPTS += $(XPCOM_LIBS)
 OS_LIBS		+= shell32.lib ole32.lib uuid.lib imagehlp.lib
 endif
 
+ifdef WRAP_SYSTEM_INCLUDES
+DEFINES        	+= -DWRAP_SYSTEM_INCLUDES
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c
index 2f645e835d3..21a3c387994 100644
--- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c
+++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c
@@ -87,10 +87,16 @@
 char *nsDemangle(const char *);
 #endif
 
+#ifdef WRAP_SYSTEM_INCLUDES
+#pragma GCC visibility push(default)
+#endif
 extern __ptr_t __libc_malloc(size_t);
 extern __ptr_t __libc_calloc(size_t, size_t);
 extern __ptr_t __libc_realloc(__ptr_t, size_t);
 extern void    __libc_free(__ptr_t);
+#ifdef WRAP_SYSTEM_INCLUDES
+#pragma GCC visibility pop
+#endif
 
 /* XXX I wish dladdr could find local text symbols (static functions). */
 #define __USE_GNU 1